Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

conduwuit
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7e4dc657

Commit 7e4dc657 authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Update Dockerfile and docker-compose

See merge request famedly/conduit!39

parents 42c9ba2e 634fe04c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 5 additions, 3 deletions

Dockerfile
README.md 4 additions, 1 deletion

README.md
docker-compose.yml 27 additions, 21 deletions

docker-compose.yml
docker/README.md 6 additions, 4 deletions

docker/README.md
docker/docker-compose.traefik.yml 20 additions, 13 deletions

docker/docker-compose.traefik.yml

with 62 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment