fixed sortorder

This commit is contained in:
André Bauer 2020-02-25 20:00:31 +01:00 committed by GitHub
parent 0867f031ff
commit d35dc01480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,6 +7,11 @@ services:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
entrypoint: /usr/local/bin/backup.sh entrypoint: /usr/local/bin/backup.sh
environment:
- BACKUP_SLEEP=86400
- HOLD_DAYS=10
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASSWORD=${POSTGRES_PASS}
image: ${IMAGE_REPO}:zammad-postgresql${VERSION} image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
links: links:
- zammad-postgresql - zammad-postgresql
@ -14,17 +19,13 @@ services:
volumes: volumes:
- zammad-backup:/var/tmp/zammad - zammad-backup:/var/tmp/zammad
- zammad-data:/opt/zammad - zammad-data:/opt/zammad
environment:
- BACKUP_SLEEP=86400
- HOLD_DAYS=10
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASSWORD=${POSTGRES_PASS}
zammad-elasticsearch: zammad-elasticsearch:
image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
restart: ${RESTART}
environment: environment:
- discovery.type=single-node - discovery.type=single-node
image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
restart: ${RESTART}
volumes: volumes:
- elasticsearch-data:/usr/share/elasticsearch/data - elasticsearch-data:/usr/share/elasticsearch/data
@ -47,6 +48,8 @@ services:
zammad-nginx: zammad-nginx:
command: ["zammad-nginx"] command: ["zammad-nginx"]
expose:
- "80"
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
@ -56,17 +59,15 @@ services:
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
- zammad-data:/opt/zammad - zammad-data:/opt/zammad
expose:
- "80"
zammad-postgresql: zammad-postgresql:
environment:
- POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASS}
image: ${IMAGE_REPO}:zammad-postgresql${VERSION} image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
- postgresql-data:/var/lib/postgresql/data - postgresql-data:/var/lib/postgresql/data
environment:
- POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASS}
zammad-railsserver: zammad-railsserver:
command: ["zammad-railsserver"] command: ["zammad-railsserver"]