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

Update docker-compose for Zanata 4.2+ #23

Merged
merged 3 commits into from
Nov 24, 2017
Merged

Update docker-compose for Zanata 4.2+ #23

merged 3 commits into from
Nov 24, 2017

Conversation

seanf
Copy link
Contributor

@seanf seanf commented Jun 29, 2017

Based on #20 and parts of https://github.com/jurikolo/zanata/blob/3906624e35b5aa8fae355d3e305f4e226afa6807/docker-compose.yml.

This docker-compose file uses v2.1 format, which is available in Docker 1.13.1+ (Fedora 26+). https://docs.docker.com/compose/compose-file/compose-versioning/


This change is Reviewable

docker-compose.yml as a scripts replacement
@seanf seanf changed the title Support docker-compose 2.0 file format Update docker-compose for Zanata 4.2+ Nov 23, 2017
@definite
Copy link
Member

:lgtm:


Reviewed 2 of 2 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@tholu
Copy link
Contributor

tholu commented Nov 23, 2017

Can you add those variables to the .env file (perhaps commented)?

ZANATA_DAEMON_MODE=
ZANATA_MAIL_HOST=
ZANATA_MAIL_PORT=
ZANATA_MAIL_USERNAME=
ZANATA_MAIL_PASSWORD=

@seanf
Copy link
Contributor Author

seanf commented Nov 24, 2017

@tholu Can you elaborate? I don't think putting them in the .env file file would do anything by itself, because "Environment variables defined in the .env file are not automatically visible inside containers." - https://docs.docker.com/compose/env-file/#compose-file-and-cli-variables

I think it would be best to tackle these extras in a separate pull request.

@seanf
Copy link
Contributor Author

seanf commented Nov 24, 2017

We've done a bit of smoke testing on this, but, as usual, let us know if there's a problem with the docker images/config.

Thanks for the contributions @SlavikZ and @jurikolo.

@seanf seanf added No QA and removed On QA labels Nov 24, 2017
@seanf seanf merged commit 91ddffa into master Nov 24, 2017
@seanf seanf deleted the docker-compose-20 branch November 24, 2017 00:26
@tholu
Copy link
Contributor

tholu commented Nov 24, 2017

@seanf Of course they would have to be provided in the docker-compose.yml file as well, right now it's not immediately clear from documentation, that these can be configured at all.

  environment:
      - MAIL_HOST=${ZANATA_MAIL_HOST}
      - MAIL_PORT=${ZANATA_MAIL_PORT}
      - MAIL_USERNAME=${ZANATA_MAIL_USERNAME}
      - MAIL_PASSWORD=${ZANATA_MAIL_PASSWORD}
      - [...]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants