update to latest version

This commit is contained in:
matti 2023-02-16 23:10:04 +01:00
parent 5703faa381
commit 5a88ce65b3
2 changed files with 8 additions and 14 deletions

View file

@ -1,25 +1,19 @@
version: '3.9' version: '3'
networks: networks:
proxy: proxy:
external: true external: true
services: services:
zammad-backup:
container_name: zammad-backup
image: bash:latest
restart: "no"
entrypoint: ["echo", "backup disabled in compose.override.yml"]
zammad-elasticsearch: zammad-elasticsearch:
container_name: zammad-elasticsearch container_name: zammad-elasticsearch
mem_limit: 6g mem_limit: 6g
environment:
- "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true"
healthcheck: healthcheck:
test: curl -s http://localhost:9200 --output /dev/null || exit 1 test: curl -s http://localhost:9200 --output /dev/null || exit 1
interval: 60s interval: 60s
timeout: 10s timeout: 10s
retries: 30 retries: 30
zammad-nginx: zammad-nginx:
container_name: zammad-nginx container_name: zammad-nginx
healthcheck: healthcheck:

View file

@ -8,21 +8,21 @@ services:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
- zammad-postgresql - zammad-postgresql
# entrypoint: /usr/local/bin/backup.sh entrypoint: /usr/local/bin/backup.sh
environment: environment:
- BACKUP_SLEEP=86400 - BACKUP_SLEEP=86400
- HOLD_DAYS=10 - HOLD_DAYS=10
- POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASSWORD=${POSTGRES_PASS} - POSTGRESQL_PASSWORD=${POSTGRES_PASS}
image: postgres:15.0-alpine image: postgres:${POSTGRES_VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
- zammad-backup:/var/tmp/zammad - zammad-backup:/var/tmp/zammad
- zammad-data:/opt/zammad:ro - zammad-data:/opt/zammad:ro
# - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
zammad-elasticsearch: zammad-elasticsearch:
image: bitnami/elasticsearch:8.5.0 image: bitnami/elasticsearch:8.5.1
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
- elasticsearch-data:/bitnami/elasticsearch/data - elasticsearch-data:/bitnami/elasticsearch/data
@ -61,7 +61,7 @@ services:
environment: environment:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASS} - POSTGRES_PASSWORD=${POSTGRES_PASS}
image: postgres:15.0-alpine image: postgres:${POSTGRES_VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
- postgresql-data:/var/lib/postgresql/data - postgresql-data:/var/lib/postgresql/data
@ -81,7 +81,7 @@ services:
- zammad-data:/opt/zammad - zammad-data:/opt/zammad
zammad-redis: zammad-redis:
image: redis:6.2.5-alpine image: redis:7.0.5-alpine
restart: ${RESTART} restart: ${RESTART}
zammad-scheduler: zammad-scheduler: