Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into beyond-agentur-master

Browse Source
This commit is contained in:
André Bauer 2017-11-11 11:20:03 +01:00
commit 1cd22e947a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env Normal file
View File

@ -0,0 +1,3 @@
# don't forget to add the minus before the version
# it should look like: VERSION=-2.1.0-13
VERSION=

14
docker-compose.yml
View File

@ -5,7 +5,7 @@ services:
zammad-backup: zammad-backup:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: zammad/zammad-docker-compose:zammad-postgresql image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
@ -18,7 +18,7 @@ services:
command: zammad-backup command: zammad-backup
zammad-elasticsearch: zammad-elasticsearch:
image: zammad/zammad-docker-compose:zammad-elasticsearch image: zammad/zammad-docker-compose:zammad-elasticsearch${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
restart: always restart: always
@ -28,7 +28,7 @@ services:
zammad-nginx: zammad-nginx:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: zammad/zammad-docker-compose:zammad-nginx image: zammad/zammad-docker-compose:zammad-nginx${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
@ -39,7 +39,7 @@ services:
- data-zammad:/home/zammad - data-zammad:/home/zammad
zammad-postgresql: zammad-postgresql:
image: zammad/zammad-docker-compose:zammad-postgresql image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
restart: always restart: always
@ -47,7 +47,7 @@ services:
zammad-railsserver: zammad-railsserver:
depends_on: depends_on:
- zammad-postgresql - zammad-postgresql
image: zammad/zammad-docker-compose:zammad image: zammad/zammad-docker-compose:zammad${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
@ -61,7 +61,7 @@ services:
zammad-scheduler: zammad-scheduler:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: zammad/zammad-docker-compose:zammad image: zammad/zammad-docker-compose:zammad${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
@ -75,7 +75,7 @@ services:
zammad-websocket: zammad-websocket:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: zammad/zammad-docker-compose:zammad image: zammad/zammad-docker-compose:zammad${VERSION}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links: