Skip to content
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

convert docker compose files to v2 #755

Merged
merged 3 commits into from
Jun 3, 2016
Merged

convert docker compose files to v2 #755

merged 3 commits into from
Jun 3, 2016

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented May 23, 2016

Converted the remaining two docker compose files over to the v2 format as suggested in #753 in hopes that the dns server in docker would resolve the hostnames of the containers instead of going off-box for hostname resolution.

Signed-off-by: Andrew Hsu andrewhsu@acm.org

@docker-jenkins
Copy link

Can one of the admins verify this patch?

@andrewhsu
Copy link
Contributor Author

Hmm..looks like the circleci test failed because it does not have high enough docker version:

ERROR: The Docker Engine version is less than the minimum required by Compose. Your current project requires a Docker Engine of version 1.10.0 or greater.

@cyli
Copy link
Contributor

cyli commented May 24, 2016

@andrewhsu Thank you for your contribution! I'm trying to update our circle config to bump up the docker version: #756, but am still working out a few kinks

@endophage
Copy link
Contributor

We've merged 756 so please rebase and see if CircleCI works now.

Signed-off-by: Andrew Hsu <andrewhsu@acm.org>
@andrewhsu
Copy link
Contributor Author

@endophage i've rebased, but it looks like circleci build failed again. look like https://gopkg.in is down which is preventing go from getting what it needs: https://circleci.com/gh/docker/notary/3040

Signed-off-by: Andrew Hsu <andrewhsu@acm.org>
@cyli
Copy link
Contributor

cyli commented Jun 1, 2016

jenkins, test this please

@cyli
Copy link
Contributor

cyli commented Jun 1, 2016

@andrewhsu Thank you so much for your contribution! Apologies for the delayed response - our team has been mostly out of office at conferences and whatnot. Thank you for splitting the signer out so clients don't have to have access to the signer or DB as well.

The one non-blocking nitpick I have is that "rdb" in the docker-compose.rethink.yml file stands for rethink-db, so would it make sense to change the network in these two to "mysql" or some such?

Signed-off-by: Andrew Hsu <andrewhsu@acm.org>
@andrewhsu
Copy link
Contributor Author

andrewhsu commented Jun 1, 2016

@cyli i've renamed rdb to mdb instead of mysql so that the network name is different from the service name.

@riyazdf
Copy link
Contributor

riyazdf commented Jun 1, 2016

jenkins, test this please

@riyazdf
Copy link
Contributor

riyazdf commented Jun 1, 2016

thank you for this contribution! Tested the docker-compose.yml locally (the other is covered by make integration in CI), LGTM

@endophage
Copy link
Contributor

LGTM

@endophage endophage merged commit 1a70055 into notaryproject:master Jun 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants