-
Notifications
You must be signed in to change notification settings - Fork 7
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
fix: use dhis2/docker-compose instead of amcgee/dhis2-backend as default #61
Conversation
@varl thanks for pushing this forward! Two questions:
|
docker-compose/
├── app-store
│ └── docker-compose.yml
├── cluster
│ └── docker-compose.yml
└── e2e
└── docker-compose.yml |
Yeah, I think I like that better too, but unfortunately it complicates the technical process of downloading the archive - github only supports downloading and caching whole-repo archives (see dear-github/dear-github#95). We could download the whole thing and then reference different sub-dirs for different cases, but that makes it less generic (harder to host your own compose repo somewhere). Doable though, might be worth it! For now I think just moving the repo to |
It does. I do think it might be worth it, and there is the option of forking the dhis2/docker-compose repo, then just removing unused subdirs leaving only One variant could be that once we extracted the archive and see that there is no For example: d2 cluster up smth
Initializing Docker Compose repository...
Docker Compose repo doesn't have a root docker-compose file...
Select a sub-directory (use `?` for a list): ?
cluster, e2e, custom
Select a sub-directory (use `?` for a list): cluster
Selected: cluster/docker-compose.yml
Spinning up cluster smth |
I've moved Thinking about this a little more just now, though, maybe it would make more sense to keep
Thought @varl? |
Sounds good to me! Edit:
|
20d9884
to
89516ab
Compare
Yep https://github.com/amcgee/dhis2-backend
I think so too
Why is that? |
Merged dhis2/d2-cluster-docker-compose#4 so we should be ready to add support for subdirs here |
I might have misunderstood the following quote:
I interpreted the part about keeping it around as a flat option as in that it should be an option going forward as well, not just keeping it around for old versions of d2. So a user could use a flat docker-compose repo with d2-cluster as well as a sub-directory based docker-compose repo. If we are only keeping amcgee/dhis2-backend around as a backwards compatible thing for old versions of d2-cluster, then we can scratch that requirement and only support sub-directory based docker-compose repos going forward. |
@varl got it, yep I just meant for backwards compatibility! |
c79533a
to
3e6be26
Compare
@amcgee This is as simple as I could make it. The If you set |
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.
Nice @varl, looks good! Haven't tested but approving based on code review.
There's actually a super-secret hack which means this is configurable on the command line, since the config is resolved from argv. Yargs doesn't whitelist options, so you could technically do d2 cluster up 2.32.0 --dockerComposeRepository <url> --dockerComposeDirectory myCustomDir
. I don't actually love the loosey-goosey yargs approach, but it's a bonus (undocumented and unpromoted) feature for now!
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.
One thing to consider.... this will create duplicates of the full multi-docker-compose repo for every named cluster in the cache, which might be something we should avoid in the future.
Yeah, but I'll see if I can handle that in the #53, or, if I cannot, it's not that many duplicated bytes. |
## [1.2.4](v1.2.3...v1.2.4) (2019-06-13) ### Bug Fixes * use dhis2/docker-compose instead of amcgee/dhis2-backend as default ([#61](#61)) ([85d708f](85d708f))
🎉 This PR is included in version 1.2.4 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
I forked https://github.com/amcgee/dhis2-backend to https://github.com/dhis2/docker-compose as I figure it's time for the Docker Compose setup to be under the official org on GitHub.
This PR updates the configuration default to the DHIS2 docker-compose repo.