Skip to content

Commit

Permalink
Switch to Zammad 6.3. (#402)
Browse files Browse the repository at this point in the history
* Switch to Zammad 6.3.
* Specify PG pool size.
  • Loading branch information
mgruner committed Apr 17, 2024
1 parent 3f80007 commit 93ba19c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 18 deletions.
11 changes: 6 additions & 5 deletions .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
POSTGRESQL_OPTIONS=?pool=50
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
# You can also use floating versions that will give you automatic updates:
# VERSION=6.2 # all patchlevel updates
# VERSION=6 # including minor updates
Expand Down
8 changes: 4 additions & 4 deletions .github/tests.sh
Expand Up @@ -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 :)"
Expand All @@ -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)"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-remote-image.yaml
Expand Up @@ -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
7 changes: 0 additions & 7 deletions docker-compose.yml
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -133,5 +128,3 @@ volumes:
driver: local
zammad-storage:
driver: local
zammad-var:
driver: local
2 changes: 1 addition & 1 deletion scripts/backup.sh
Expand Up @@ -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}"
Expand Down

0 comments on commit 93ba19c

Please sign in to comment.