diff --git a/LICENSE b/LICENSE index a4e9dc9..cfe6111 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT No Attribution -Copyright +Copyright 2023 angestöpselt e.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/docker-compose.yml b/docker-compose.yml index 5be1643..6cd772f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,30 @@ --- -version: '3.2' +version: '3.8' services: + + zammad-backup: + command: ["zammad-backup"] + depends_on: + - zammad-railsserver + - zammad-postgresql + entrypoint: /usr/local/bin/backup.sh + environment: + - BACKUP_TIME=03:00 + - HOLD_DAYS=10 + - POSTGRESQL_DB=${POSTGRES_DB} + - POSTGRESQL_USER=${POSTGRES_USER} + - POSTGRESQL_PASSWORD=${POSTGRES_PASS} + - TZ=Europe/Berlin + image: postgres:${POSTGRES_VERSION} + restart: ${RESTART} + volumes: + - zammad-backup:/var/tmp/zammad + - zammad-var:/opt/zammad/var:ro + - ${APP_DATA}/zammad/scripts/backup.sh:/usr/local/bin/backup.sh:ro + zammad-elasticsearch: - image: bitnami/elasticsearch:8.5.1 + image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION} restart: ${RESTART} volumes: - elasticsearch-data:/bitnami/elasticsearch/data @@ -14,17 +35,17 @@ services: - zammad-postgresql environment: - MEMCACHE_SERVERS=${MEMCACHE_SERVERS} - - POSTGRESQL_USER=${POSTGRES_USER} - - POSTGRESQL_PASS=${POSTGRES_PASS} - REDIS_URL=${REDIS_URL} image: ${IMAGE_REPO}:${VERSION} restart: on-failure + user: 0:0 volumes: - - zammad-data:/opt/zammad + - zammad-config-nginx:/etc/nginx/sites-enabled + - zammad-var:/opt/zammad/var zammad-memcached: command: memcached -m 256M - image: memcached:1.6.17-alpine + image: memcached:${MEMCACHE_VERSION} restart: ${RESTART} zammad-nginx: @@ -36,10 +57,12 @@ services: image: ${IMAGE_REPO}:${VERSION} restart: ${RESTART} volumes: - - zammad-data:/opt/zammad + - zammad-config-nginx:/etc/nginx/sites-enabled:ro + - zammad-var:/opt/zammad/var:ro zammad-postgresql: environment: + - POSTGRES_DB=${POSTGRES_DB} - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASS} image: postgres:${POSTGRES_VERSION} @@ -59,11 +82,13 @@ services: image: ${IMAGE_REPO}:${VERSION} restart: ${RESTART} volumes: - - zammad-data:/opt/zammad + - zammad-var:/opt/zammad/var zammad-redis: - image: redis:7.0.5-alpine + image: redis:${REDIS_VERSION} restart: ${RESTART} + volumes: + - redis-data:/data zammad-scheduler: command: ["zammad-scheduler"] @@ -77,7 +102,7 @@ services: image: ${IMAGE_REPO}:${VERSION} restart: ${RESTART} volumes: - - zammad-data:/opt/zammad + - zammad-var:/opt/zammad/var zammad-websocket: command: ["zammad-websocket"] @@ -91,14 +116,18 @@ services: image: ${IMAGE_REPO}:${VERSION} restart: ${RESTART} volumes: - - zammad-data:/opt/zammad + - zammad-var:/opt/zammad/var volumes: elasticsearch-data: driver: local postgresql-data: driver: local + redis-data: + driver: local zammad-backup: driver: local - zammad-data: + zammad-config-nginx: driver: local + zammad-var: + driver: local \ No newline at end of file