sort vars

.env

@@ -1,14 +1,9 @@
-ELASTICSEARCH_VERSION=8.8.0
+IMAGE_REPO=zammad/zammad-docker-compose
-IMAGE_REPO=ghcr.io/zammad/zammad
 MEMCACHE_SERVERS=zammad-memcached:11211
-MEMCACHE_VERSION=1.6.20-alpine
+POSTGRES_VERSION=15.1-alpine
-POSTGRES_DB=zammad_production
 POSTGRES_PASS=zammad
 POSTGRES_USER=zammad
-POSTGRES_HOST=zammad-postgresql
+POSTGRES_DB=zammad_production
-POSTGRES_PORT=5432
-POSTGRES_VERSION=15.3-alpine
 REDIS_URL=redis://zammad-redis:6379
-REDIS_VERSION=7.0.5-alpine
 RESTART=always
-VERSION=6.0.0-66
+VERSION=5.4.1-29

.github/tests.sh

@@ -23,28 +23,16 @@ echo
 echo "Execute autowizard..."
 echo
 
-docker exec --env=AUTOWIZARD_RELATIVE_PATH=var/auto_wizard.json --env=DATABASE_URL=postgres://zammad:zammad@zammad-postgresql:5432/zammad_production zammad-docker-compose_zammad-railsserver_1 rake zammad:setup:auto_wizard
+docker exec zammad-docker-compose_zammad-railsserver_1 rake zammad:setup:auto_wizard
 
 echo
 echo "Autowizard executed successful :)"
 echo
 
 
-echo
-echo "Check DB for AutoWizard user"
-echo 
-
-docker exec --env=DATABASE_URL=postgres://zammad:zammad@zammad-postgresql:5432/zammad_production zammad-docker-compose_zammad-railsserver_1 rails r "p User.find_by(email: 'info@zammad.org')" | grep 'info@zammad.org'
-
-echo
-echo "Check DB for AutoWizard user successfull :)"
-echo 
-
 echo
 echo "Fill DB with some random data"
-echo 
+docker exec zammad-docker-compose_zammad-railsserver_1 rails r "FillDb.load(agents: 1,customers: 1,groups: 1,organizations: 1,overviews: 1,tickets: 1)"
-
-docker exec --env=DATABASE_URL=postgres://zammad:zammad@zammad-postgresql:5432/zammad_production zammad-docker-compose_zammad-railsserver_1 rails r "FillDb.load(agents: 1,customers: 1,groups: 1,organizations: 1,overviews: 1,tickets: 1)"
 
 echo
 echo "DB fill successful :)"

.github/workflows/ci-remote-image.yaml

@@ -19,7 +19,7 @@ jobs:
         run: docker-compose up --detach
 
       - name: add autowizard file
-        run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad/var
+        run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad
 
       - name: run tests
         run: .github/tests.sh

README.md

@@ -23,7 +23,7 @@ For upgrading instructions see our [Releases](https://github.com/zammad/zammad-d
 
 ## Status
 
-[![ci-remote-image](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml/badge.svg)](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml) [![Dockerhub Pulls](https://badgen.net/docker/pulls/zammad/zammad-docker-compose?icon=docker&label=pulls)](https://hub.docker.com/r/zammad/zammad-docker-compose/)
+[![ci-remote-image](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml/badge.svg)](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml) [![Docker Pulls](https://badgen.net/docker/pulls/zammad/zammad-docker-compose?icon=docker&label=pulls)](https://hub.docker.com/r/zammad/zammad-docker-compose/)
 
 ## Using a reverse proxy
 

docker-compose.yml

@@ -1,5 +1,5 @@
 ---
-version: '3.8'
+version: '3'
 
 services:
 
@@ -20,11 +20,11 @@ services:
     restart: ${RESTART}
     volumes:
       - zammad-backup:/var/tmp/zammad
-      - zammad-var:/opt/zammad/var:ro
+      - zammad-data:/opt/zammad:ro
       - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
 
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION}
+    image: bitnami/elasticsearch:8.5.1
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/bitnami/elasticsearch/data
@@ -35,17 +35,18 @@ services:
       - zammad-postgresql
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
+      - POSTGRESQL_DB=${POSTGRES_DB}
+      - POSTGRESQL_USER=${POSTGRES_USER}
+      - POSTGRESQL_PASS=${POSTGRES_PASS}
       - REDIS_URL=${REDIS_URL}
     image: ${IMAGE_REPO}:${VERSION}
     restart: on-failure
-    user: 0:0
     volumes:
-      - zammad-config-nginx:/etc/nginx/sites-enabled
+      - zammad-data:/opt/zammad
-      - zammad-var:/opt/zammad/var
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:${MEMCACHE_VERSION}
+    image: memcached:1.6.17-alpine
     restart: ${RESTART}
 
   zammad-nginx:
@@ -57,8 +58,7 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-config-nginx:/etc/nginx/sites-enabled:ro
+      - zammad-data:/opt/zammad
-      - zammad-var:/opt/zammad/var:ro
 
   zammad-postgresql:
     environment:
@@ -82,13 +82,11 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
   zammad-redis:
-    image: redis:${REDIS_VERSION}
+    image: redis:7.0.5-alpine
     restart: ${RESTART}
-    volumes:
-      - redis-data:/data
 
   zammad-scheduler:
     command: ["zammad-scheduler"]
@@ -102,7 +100,7 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
   zammad-websocket:
     command: ["zammad-websocket"]
@@ -116,18 +114,14 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
 volumes:
   elasticsearch-data:
     driver: local
   postgresql-data:
     driver: local
-  redis-data:
-    driver: local
   zammad-backup:
     driver: local
-  zammad-config-nginx:
+  zammad-data:
-    driver: local
-  zammad-var:
     driver: local

scripts/backup.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-: "${ZAMMAD_DIR:=/opt/zammad/var}"
+: "${ZAMMAD_DIR:=/opt/zammad}"
 : "${BACKUP_DIR:=/var/tmp/zammad}"
 : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}"
 : "${ZAMMAD_RAILSSERVER_PORT:=3000}"