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

fixes #issue 15

Browse Source
This commit is contained in:
André Bauer 2017-04-05 22:09:51 +02:00
parent 983b72660d
commit db9efbed97
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker-compose-build.yml
View File

@ -1,4 +1,4 @@
version: '2' version: '3'
services: services:
@ -50,28 +50,34 @@ services:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
restart: always restart: always
volumes:
- data-zammad:/home/zammad
zammad-scheduler: zammad-scheduler:
build: build:
context: . context: .
dockerfile: containers/zammad-scheduler/Dockerfile dockerfile: containers/zammad-scheduler/Dockerfile
depends_on: depends_on:
- zammad-railsserver - zammad
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
restart: always restart: always
volumes:
- data-zammad:/home/zammad
zammad-websocket: zammad-websocket:
build: build:
context: . context: .
dockerfile: containers/zammad-websocket/Dockerfile dockerfile: containers/zammad-websocket/Dockerfile
depends_on: depends_on:
- zammad-railsserver - zammad
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
restart: always restart: always
volumes:
- data-zammad:/home/zammad
volumes: volumes:
data-zammad: data-zammad:

20
docker-compose.yml
View File

@ -1,4 +1,4 @@
version: '2' version: '3'
services: services:
@ -42,39 +42,45 @@ services:
restart: always restart: always
zammad-railsserver: zammad-railsserver:
depends_on:
- zammad
image: zammad/zammad-docker-compose:zammad-railsserver image: zammad/zammad-docker-compose:zammad-railsserver
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
- zammad
depends_on: depends_on:
- zammad - zammad
restart: always restart: always
volumes:
- data-zammad:/home/zammad
zammad-scheduler: zammad-scheduler:
depends_on:
- zammad
image: zammad/zammad-docker-compose:zammad-scheduler image: zammad/zammad-docker-compose:zammad-scheduler
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
- zammad
depends_on:
- zammad-railsserver
restart: always restart: always
volumes:
- data-zammad:/home/zammad
zammad-websocket: zammad-websocket:
depends_on:
- zammad
image: zammad/zammad-docker-compose:zammad-websocket image: zammad/zammad-docker-compose:zammad-websocket
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
links: links:
- zammad-postgresql - zammad-postgresql
- zammad - zammad
depends_on:
- zammad-railsserver
restart: always restart: always
volumes:
- data-zammad:/home/zammad
volumes: volumes:
data-zammad: data-zammad: