-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(quickstart): Simplify docker generate and compare script #3434
feat(quickstart): Simplify docker generate and compare script #3434
Conversation
MONITORING_COMPOSE="-f quickstart/docker-compose.quickstart.monitoring.yml" | ||
MONITORING_COMPOSE="-f quickstart/docker-compose.monitoring.quickstart.yml" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
out of curiosity, what was the motivation behind this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be able to include the '.monitor' flavour in the for
loop to avoid a separate if cmp
code block for that file. And it better aligns with the naming in docker/monitoring
.
In https://github.com/EnricoMi/datahub/pull/6/files#diff-135ef7fb531c210baeeab0b42a4e2589366367ea773e52c524140844eb583b8b I am adding more quickstart files and #3286 might also want a quickstart flavour one day.
printf 'docker-compose.quickstart.yml is out of date.' | ||
python generate_docker_quickstart.py ../monitoring/docker-compose.monitoring.yml temp.monitoring.quickstart.yml | ||
|
||
for flavour in "" "-without-neo4j" ".monitoring" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's make this a constant declared at the top of the file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good idea, done
b9a1f1e
to
b5eb5a2
Compare
@gabe-lyons is this good to go? |
@EnricoMi : sorry for the radio silence on this one, we'll shepherd this in this week. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There is
docker/monitoring/docker-compose.monitoring.yml
butdocker/quickstart/docker-compose.quickstart.monitoring.yml
. If both filenames follow the same naming scheme, i.e.docker-compose.monitoring.quickstart.yml
, then some code duplication indocker/quickstart/generate_and_compare.sh
could be reduced:There might more quickstart scripts being added in the future, e.g. for #3261 (see https://github.com/EnricoMi/datahub/pull/6/files#diff-135ef7fb531c210baeeab0b42a4e2589366367ea773e52c524140844eb583b8b) which would benefit from this.