diff --git a/README.md b/README.md index 2c7542b..3411231 100644 --- a/README.md +++ b/README.md @@ -75,3 +75,8 @@ ALTER USER zammad WITH SUPERUSER CREATEDB; To be able to run Zammad container with an unprivileged user we had to change the port Nginx uses from 80 to 8080, so Zammad needs to be accessed via instead of now! This change will also affect you, if you use a reverse proxy, like Traefik or Haproxy, in front of Zammad as your reverse proxy configuration needs to be adapted to point to port 8080 now. + +### From =< 4.0.0 to 5.0.0 + +Memchached config changed. If you use the old env vars `MEMCACHED_HOST` & `MEMCACHED_PORT` addapt to `MEMCACHE_SERVERS`. +Redis is a dependency for the Websocket server now. diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index fbfc2b5..b3d467a 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -75,6 +75,7 @@ if [ "$1" = 'zammad-init' ]; then echo "${AUTOWIZARD_JSON}" | base64 -d > auto_wizard.json fi else + bundle exec rails r "Cache.clear" bundle exec rake db:migrate fi diff --git a/docker-compose.yml b/docker-compose.yml index c793b0e..a3a1393 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: @@ -6,6 +6,7 @@ services: command: ["zammad-backup"] depends_on: - zammad-railsserver + - zammad-postgresql entrypoint: /usr/local/bin/backup.sh environment: - BACKUP_SLEEP=86400 @@ -13,8 +14,6 @@ services: - POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_PASSWORD=${POSTGRES_PASS} image: ${IMAGE_REPO}:zammad-postgresql${VERSION} - links: - - zammad-postgresql restart: ${RESTART} volumes: - zammad-backup:/var/tmp/zammad @@ -36,9 +35,6 @@ services: - POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_PASS=${POSTGRES_PASS} image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-elasticsearch - - zammad-postgresql restart: on-failure volumes: - zammad-data:/opt/zammad @@ -55,9 +51,6 @@ services: depends_on: - zammad-railsserver image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-railsserver - - zammad-websocket restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -76,11 +69,8 @@ services: depends_on: - zammad-memcached - zammad-postgresql + - zammad-redis image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-elasticsearch - - zammad-memcached - - zammad-postgresql restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -94,12 +84,8 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-elasticsearch - - zammad-memcached - - zammad-postgresql - zammad-redis + image: ${IMAGE_REPO}:zammad${VERSION} restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -109,11 +95,8 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-postgresql - - zammad-memcached - zammad-redis + image: ${IMAGE_REPO}:zammad${VERSION} restart: ${RESTART} volumes: - zammad-data:/opt/zammad