From a6e949275c68443d28bb547e90051a8ca4ebfbc1 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Mon, 25 Mar 2024 11:09:58 +0100 Subject: [PATCH 1/5] Switch to Zammad 6.3. --- .env | 11 ++++++----- .github/workflows/ci-remote-image.yaml | 2 +- docker-compose.yml | 7 ------- scripts/backup.sh | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.env b/.env index ee5baf1c..b5ae65b5 100644 --- a/.env +++ b/.env @@ -1,18 +1,19 @@ -ELASTICSEARCH_VERSION=8.8.0 +ELASTICSEARCH_VERSION=8.12.2 IMAGE_REPO=ghcr.io/zammad/zammad MEMCACHE_SERVERS=zammad-memcached:11211 -MEMCACHE_VERSION=1.6.20-alpine +MEMCACHE_VERSION=1.6.25-alpine POSTGRES_DB=zammad_production POSTGRES_PASS=zammad POSTGRES_USER=zammad POSTGRES_HOST=zammad-postgresql POSTGRES_PORT=5432 -POSTGRES_VERSION=15.3-alpine +POSTGRES_VERSION=15.6-alpine REDIS_URL=redis://zammad-redis:6379 -REDIS_VERSION=7.0.5-alpine +REDIS_VERSION=7.2.4-alpine RESTART=always # Use a fixed version. You are responsible to update this to newer patch level versions yourself. -VERSION=6.2.0-1 +# VERSION=6.3.0-0 +VERSION=develop # You can also use floating versions that will give you automatic updates: # VERSION=6.2 # all patchlevel updates # VERSION=6 # including minor updates diff --git a/.github/workflows/ci-remote-image.yaml b/.github/workflows/ci-remote-image.yaml index 2ffd1ef5..54513c01 100644 --- a/.github/workflows/ci-remote-image.yaml +++ b/.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/tmp - name: run tests run: .github/tests.sh diff --git a/docker-compose.yml b/docker-compose.yml index 21f69367..54387941 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,6 @@ x-shared: restart: ${RESTART} volumes: - zammad-storage:/opt/zammad/storage - - zammad-var:/opt/zammad/var depends_on: - zammad-memcached - zammad-postgresql @@ -59,7 +58,6 @@ services: volumes: - zammad-backup:/var/tmp/zammad - zammad-storage:/opt/zammad/storage:ro - - zammad-var:/opt/zammad/var:ro - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro zammad-elasticsearch: @@ -77,7 +75,6 @@ services: user: 0:0 volumes: - zammad-storage:/opt/zammad/storage - - zammad-var:/opt/zammad/var zammad-memcached: command: memcached -m 256M @@ -91,8 +88,6 @@ services: - "8080" depends_on: - zammad-railsserver - volumes: - - zammad-var:/opt/zammad/var:ro # required for the zammad-ready check file zammad-postgresql: environment: @@ -133,5 +128,3 @@ volumes: driver: local zammad-storage: driver: local - zammad-var: - driver: local diff --git a/scripts/backup.sh b/scripts/backup.sh index a8596a8e..e0bf4a2a 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -2,7 +2,7 @@ set -e -: "${ZAMMAD_DIR:=/opt/zammad/var}" +: "${ZAMMAD_DIR:=/opt/zammad/storage}" : "${BACKUP_DIR:=/var/tmp/zammad}" : "${BACKUP_TIME:=03:00}" : "${HOLD_DAYS:=10}" From e9e49d009cd90bcc62b4ca8e84f395c791cd8127 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Mon, 25 Mar 2024 11:17:43 +0100 Subject: [PATCH 2/5] Revert PG version change to see if it fixes test issues. --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index b5ae65b5..c97439b2 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad POSTGRES_HOST=zammad-postgresql POSTGRES_PORT=5432 -POSTGRES_VERSION=15.6-alpine +POSTGRES_VERSION=15.3-alpine REDIS_URL=redis://zammad-redis:6379 REDIS_VERSION=7.2.4-alpine RESTART=always From 114e0c5e4ec9be16364dee7da1efe0a52287bda4 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Mon, 25 Mar 2024 11:39:56 +0100 Subject: [PATCH 3/5] Specify PG pool size. --- .env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index c97439b2..5784054f 100644 --- a/.env +++ b/.env @@ -7,7 +7,8 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad POSTGRES_HOST=zammad-postgresql POSTGRES_PORT=5432 -POSTGRES_VERSION=15.3-alpine +POSTGRES_VERSION=15.6-alpine +POSTGRESQL_OPTIONS=?pool=50 REDIS_URL=redis://zammad-redis:6379 REDIS_VERSION=7.2.4-alpine RESTART=always From 9c1c9c171d78265be3796534d0506137a916538b Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Mon, 25 Mar 2024 11:44:43 +0100 Subject: [PATCH 4/5] Fix test. --- .github/tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/tests.sh b/.github/tests.sh index bfd2337d..8cca1f4b 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -23,7 +23,7 @@ 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 --env=AUTOWIZARD_RELATIVE_PATH=tmp/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 echo echo "Autowizard executed successful :)" @@ -32,17 +32,17 @@ echo echo echo "Check DB for AutoWizard user" -echo +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 echo "Fill DB with some random data" -echo +echo 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)" From 6ba5320b4d53ec16d51d910274f24752d648051f Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Wed, 17 Apr 2024 10:20:53 +0200 Subject: [PATCH 5/5] Switch to final version for 6.3.0. --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 5784054f..fccaf176 100644 --- a/.env +++ b/.env @@ -13,8 +13,7 @@ REDIS_URL=redis://zammad-redis:6379 REDIS_VERSION=7.2.4-alpine RESTART=always # Use a fixed version. You are responsible to update this to newer patch level versions yourself. -# VERSION=6.3.0-0 -VERSION=develop +VERSION=6.3.0 # You can also use floating versions that will give you automatic updates: # VERSION=6.2 # all patchlevel updates # VERSION=6 # including minor updates