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

Updated docker-compose files #194

Merged
merged 8 commits into from Jul 2, 2020
Merged

Conversation

iwilltry42
Copy link
Contributor

So this PR contains the commits of #193 unfortunately (screwed up my history a bit, sorry).
The only changes though are in docker-compose.yml (use container_names, a non-standard port and the Postgres environment variables) and in conf/docker/docker-compose.traefik.yml (example of using it in a docker-compose based environment with traefik as the network entrypoint / reverse proxy).
The former I use for local testing and the latter I use in my homelab setup (you can use ln -sfv conf/docker/docker-compose.traefik.yml docker-compose.override.yml to merge both configs: use docker-compose config to see the result).

@overshard
Copy link
Owner

Looks good to me, I'll squash and merge to avoid double commits, thanks!

@overshard overshard merged commit cf6fc2b into overshard:master Jul 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants