yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-03 20:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(quickstart): simplify docker generate and compare script (#3434)

Browse Source
This commit is contained in:
Enrico Minack 2021-11-30 08:57:47 +01:00 committed by GitHub
parent 314f877aeb
commit 66328ee23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/quickstart.sh
View File

@ -2,7 +2,7 @@
MONITORING_COMPOSE="" MONITORING_COMPOSE=""
if [[ $MONITORING == true ]]; then if [[ $MONITORING == true ]]; then
MONITORING_COMPOSE="-f quickstart/docker-compose.quickstart.monitoring.yml" MONITORING_COMPOSE="-f quickstart/docker-compose.monitoring.quickstart.yml"
fi fi
CONSUMERS_COMPOSE="" CONSUMERS_COMPOSE=""

0
docker/quickstart/docker-compose.quickstart.monitoring.yml → docker/quickstart/docker-compose.monitoring.quickstart.yml
View File

35
docker/quickstart/generate_and_compare.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# this scripts checks if docker-compose$flavour.quickstart.yml is up to date for these 'flavours':
FLAVOURS=("" "-without-neo4j" ".monitoring")
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "$DIR" cd "$DIR"
@ -10,30 +13,16 @@ source venv/bin/activate
pip install -r requirements.txt pip install -r requirements.txt
python generate_docker_quickstart.py ../docker-compose.yml ../docker-compose.override.yml temp.quickstart.yml python generate_docker_quickstart.py ../docker-compose.yml ../docker-compose.override.yml temp.quickstart.yml
python generate_docker_quickstart.py ../docker-compose-without-neo4j.yml ../docker-compose-without-neo4j.override.yml temp-without-neo4j.quickstart.yml python generate_docker_quickstart.py ../docker-compose-without-neo4j.yml ../docker-compose-without-neo4j.override.yml temp-without-neo4j.quickstart.yml
python generate_docker_quickstart.py ../monitoring/docker-compose.monitoring.yml temp.monitoring.quickstart.yml
python generate_docker_quickstart.py ../monitoring/docker-compose.monitoring.yml temp.quickstart.monitoring.yml for flavour in "${flavours[@]}"
do
if cmp docker-compose.quickstart.yml temp.quickstart.yml; then if cmp docker-compose$flavour.quickstart.yml temp$flavour.quickstart.yml; then
printf 'docker-compose.quickstart.yml is up to date.' echo "docker-compose$flavour.quickstart.yml is up to date."
else else
printf 'docker-compose.quickstart.yml is out of date.' echo "docker-compose$flavour.quickstart.yml is out of date."
exit 1 exit 1
fi fi
done
if cmp docker-compose-without-neo4j.quickstart.yml temp-without-neo4j.quickstart.yml; then
printf 'docker-compose-without-neo4j.quickstart.yml is up to date.'
exit 0
else
printf 'docker-compose-without-neo4j.quickstart.yml is out of date.'
exit 1
fi
if cmp docker-compose.quickstart.monitoring.yml temp.quickstart.monitoring.yml; then
printf 'docker-compose.quickstart.monitoring.yml is up to date.'
exit 0
else
printf 'docker-compose.quickstart.monitoring.yml is out of date.'
exit 1
fi

2
docker/quickstart/generate_docker_quickstart.sh
View File

@ -11,4 +11,4 @@ source venv/bin/activate
pip install -r requirements.txt pip install -r requirements.txt
python generate_docker_quickstart.py ../docker-compose.yml ../docker-compose.override.yml docker-compose.quickstart.yml python generate_docker_quickstart.py ../docker-compose.yml ../docker-compose.override.yml docker-compose.quickstart.yml
python generate_docker_quickstart.py ../docker-compose-without-neo4j.yml ../docker-compose-without-neo4j.override.yml docker-compose-without-neo4j.quickstart.yml python generate_docker_quickstart.py ../docker-compose-without-neo4j.yml ../docker-compose-without-neo4j.override.yml docker-compose-without-neo4j.quickstart.yml
python generate_docker_quickstart.py ../monitoring/docker-compose.monitoring.yml docker-compose.quickstart.monitoring.yml python generate_docker_quickstart.py ../monitoring/docker-compose.monitoring.yml docker-compose.monitoring.quickstart.yml