From b1ce16963aee07f9f9c2a709cebc846c7b13e338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 5 Mar 2021 03:01:22 +0100 Subject: [PATCH 01/12] Update .env (#191) --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 0e36616..1b44055 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-3.6.0-63 +VERSION=-3.6.0-65 From 9eda319ed35564ebd110f5273bf6061c9fdf0403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 18 Mar 2021 21:53:46 +0100 Subject: [PATCH 02/12] use port 8080 for nginx (#193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * use port 8080 for nginx Signed-off-by: André Bauer * fix test Signed-off-by: André Bauer * fix port in override file Signed-off-by: André Bauer * fix logging Signed-off-by: André Bauer * fix compose cmd Signed-off-by: André Bauer * fix ci timeout Signed-off-by: André Bauer --- .github/docker-image-build.sh | 4 ++-- .github/tests.sh | 2 +- .github/workflows/ci.yaml | 6 ++---- containers/zammad/Dockerfile | 1 + containers/zammad/docker-entrypoint.sh | 4 +++- containers/zammad/setup.sh | 1 - docker-compose.override-local.yml | 27 ++++++++++++++++++++++++++ docker-compose.override.yml | 2 +- docker-compose.yml | 2 +- 9 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 docker-compose.override-local.yml diff --git a/.github/docker-image-build.sh b/.github/docker-image-build.sh index f9c09e4..d119540 100755 --- a/.github/docker-image-build.sh +++ b/.github/docker-image-build.sh @@ -9,6 +9,6 @@ DOCKER_IMAGES="zammad zammad-elasticsearch zammad-postgresql" # shellcheck disable=SC2153 for DOCKER_IMAGE in ${DOCKER_IMAGES}; do - echo "Build Zammad Docker image ${DOCKER_IMAGE} for local test" - docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_IMAGE}" -f "containers/${DOCKER_IMAGE}/Dockerfile" . + echo "Build Zammad Docker image ${DOCKER_IMAGE} for local or ci tests" + docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_IMAGE}-local" -f "containers/${DOCKER_IMAGE}/Dockerfile" . done diff --git a/.github/tests.sh b/.github/tests.sh index f143eb7..1f633f8 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -8,7 +8,7 @@ set -o pipefail docker-compose logs --timestamps --follow & -until (curl -I --silent --fail localhost | grep -iq "HTTP/1.1 200 OK"); do +until (curl -I --silent --fail localhost:8080 | grep -iq "HTTP/1.1 200 OK"); do echo "wait for zammad to be ready..." sleep 15 done diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 70030b3..3243b98 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,10 +48,8 @@ jobs: uses: actions/checkout@v1 - name: build docker containers run: .github/docker-image-build.sh - - name: use images build by ci - run: sed -i -e 's#${IMAGE_REPO}:##g' -e 's#${VERSION}##g' docker-compose.yml - name: run docker-compose up - run: docker-compose up --detach + run: docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.override-local.yml up --detach - name: add autowizard file run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad - name: run tests @@ -62,7 +60,7 @@ jobs: - codespell - lint-docker-compose-file - super-linter - timeout-minutes: 10 + timeout-minutes: 20 runs-on: ubuntu-20.04 steps: - name: Checkout diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index b2368fb..6a61f3f 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -8,6 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV GIT_BRANCH stable ENV GIT_URL ${PROJECT_URL}.git ENV PROJECT_URL https://github.com/zammad/zammad +ENV RAILS_LOG_TO_STDOUT true ENV RAILS_ENV production ENV TAR_GZ_URL ${PROJECT_URL}/archive/${GIT_BRANCH}.tar.gz ENV ZAMMAD_DIR /opt/zammad diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index d1faf87..9cc0c6c 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -12,6 +12,7 @@ set -e : "${ELASTICSEARCH_SSL_VERIFY:=true}" : "${MEMCACHED_HOST:=zammad-memcached}" : "${MEMCACHED_PORT:=11211}" +: "${NGINX_PORT:=8080}" : "${NGINX_SERVER_NAME:=_}" : "${NGINX_SERVER_SCHEME:=\$scheme}" : "${POSTGRESQL_HOST:=zammad-postgresql}" @@ -120,7 +121,8 @@ if [ "$1" = 'zammad-nginx' ]; then check_zammad_ready # configure nginx - sed -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \ + sed -e "s#listen .*#listen ${NGINX_PORT};#g" \ + -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \ -e "s#server .*:3000#server ${ZAMMAD_RAILSSERVER_HOST}:${ZAMMAD_RAILSSERVER_PORT}#g" \ -e "s#server .*:6042#server ${ZAMMAD_WEBSOCKET_HOST}:${ZAMMAD_WEBSOCKET_PORT}#g" \ -e "s#server_name .*#server_name ${NGINX_SERVER_NAME};#g" \ diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 3bbf654..21e1715 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -28,7 +28,6 @@ if [ "$1" = 'builder' ]; then contrib/packager.io/fetch_locales.rb sed -e 's#.*adapter: postgresql# adapter: nulldb#g' -e 's#.*username:.*# username: postgres#g' -e 's#.*password:.*# password: \n host: zammad-postgresql\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb - sed -i '/# Use a different logger for distributed setups./a \ \ config.logger = Logger.new(STDOUT)' config/environments/production.rb sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/scheduler.rb touch db/schema.rb bundle exec rake assets:precompile diff --git a/docker-compose.override-local.yml b/docker-compose.override-local.yml new file mode 100644 index 0000000..26a0ebf --- /dev/null +++ b/docker-compose.override-local.yml @@ -0,0 +1,27 @@ +version: '2' + +services: + + zammad-backup: + image: zammad-postgresql-local + + zammad-elasticsearch: + image: zammad-elasticsearch-local + + zammad-init: + image: zammad-local + + zammad-nginx: + image: zammad-local + + zammad-postgresql: + image: zammad-postgresql-local + + zammad-railsserver: + image: zammad-local + + zammad-scheduler: + image: zammad-local + + zammad-websocket: + image: zammad-local diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 22e5cc4..c685a51 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -3,4 +3,4 @@ services: zammad-nginx: ports: - - "80:80" + - "8080:8080" diff --git a/docker-compose.yml b/docker-compose.yml index 3b5fff6..7c3b90d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: zammad-nginx: command: ["zammad-nginx"] expose: - - "80" + - "8080" depends_on: - zammad-railsserver image: ${IMAGE_REPO}:zammad${VERSION} From 73a4fbd4533579395426b378a3009c5dee51998b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 19 Mar 2021 13:13:10 +0100 Subject: [PATCH 03/12] split ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/workflows/ci-remote-image.yaml | 26 ++++++++++++++++++++++++ .github/workflows/ci.yaml | 28 ++++++++------------------ 2 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/ci-remote-image.yaml diff --git a/.github/workflows/ci-remote-image.yaml b/.github/workflows/ci-remote-image.yaml new file mode 100644 index 0000000..a5d8ab6 --- /dev/null +++ b/.github/workflows/ci-remote-image.yaml @@ -0,0 +1,26 @@ +name: ci + +on: + pull_request: + paths: + - '.env' + +jobs: + run-remote-image-docker-compose: + timeout-minutes: 20 + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: pull docker-compose images + run: docker-compose pull + + - name: run docker-compose up + run: docker-compose up --detach + + - name: add autowizard file + run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad + + - name: run tests + run: .github/tests.sh diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3243b98..ff9ea53 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,6 +10,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 + - name: Codespell uses: codespell-project/actions-codespell@master with: @@ -21,7 +22,8 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 + - name: lint zammad docker-compose file run: docker-compose config @@ -30,6 +32,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 + - name: Lint Code Base uses: github/super-linter@v3 env: @@ -45,31 +48,16 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 + - name: build docker containers run: .github/docker-image-build.sh + - name: run docker-compose up run: docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.override-local.yml up --detach - - name: add autowizard file - run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad - - name: run tests - run: .github/tests.sh - run-remote-image-docker-compose: - needs: - - codespell - - lint-docker-compose-file - - super-linter - timeout-minutes: 20 - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: pull docker-compose images - run: docker-compose pull - - name: run docker-compose up - run: docker-compose up --detach - name: add autowizard file run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad + - name: run tests run: .github/tests.sh From b39454dc36b0171813d2b78cd37a9bea11c787ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 19 Mar 2021 15:04:38 +0100 Subject: [PATCH 04/12] update to 3.6.0-67 (#194) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update to 3.6.0-67 Signed-off-by: André Bauer * fix ci name Signed-off-by: André Bauer * fix typo Signed-off-by: André Bauer --- .env | 2 +- .github/workflows/ci-remote-image.yaml | 2 +- README.md | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 1b44055..931481d 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-3.6.0-65 +VERSION=-3.6.0-67 diff --git a/.github/workflows/ci-remote-image.yaml b/.github/workflows/ci-remote-image.yaml index a5d8ab6..9ed0dc4 100644 --- a/.github/workflows/ci-remote-image.yaml +++ b/.github/workflows/ci-remote-image.yaml @@ -1,4 +1,4 @@ -name: ci +name: ci-remote-image on: pull_request: diff --git a/README.md b/README.md index d948951..2814831 100644 --- a/README.md +++ b/README.md @@ -70,3 +70,9 @@ CREATE USER zammad; ALTER USER zammad WITH PASSWORD 'zammad'; ALTER USER zammad WITH SUPERUSER CREATEDB; ``` + +### From =< 3.6.0-65 + +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 6ddc9262ed4b5fbf884e153e3de3e9a3406a487c Mon Sep 17 00:00:00 2001 From: Thorsten Date: Fri, 26 Mar 2021 11:00:32 +0100 Subject: [PATCH 05/12] Added mimemagic gem version 0.3.7 dependency. (#195) --- containers/zammad/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 21e1715..47160f3 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -3,7 +3,7 @@ set -e # install dependencies if [ "$1" = 'builder' ]; then - PACKAGES="build-essential curl git libimlib2-dev libpq-dev" + PACKAGES="build-essential curl git libimlib2-dev libpq-dev shared-mime-info" elif [ "$1" = 'runner' ]; then PACKAGES="curl libimlib2 libpq5 nginx rsync" fi From 55a8183190b5b7da7e8281d3957a7467cfd73e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 26 Mar 2021 22:58:00 +0100 Subject: [PATCH 06/12] add RAILS_LOG_TO_STDOUT to zammad container (#197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- containers/zammad/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index 6a61f3f..bb9f25e 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -8,8 +8,8 @@ ARG DEBIAN_FRONTEND=noninteractive ENV GIT_BRANCH stable ENV GIT_URL ${PROJECT_URL}.git ENV PROJECT_URL https://github.com/zammad/zammad -ENV RAILS_LOG_TO_STDOUT true ENV RAILS_ENV production +ENV RAILS_LOG_TO_STDOUT true ENV TAR_GZ_URL ${PROJECT_URL}/archive/${GIT_BRANCH}.tar.gz ENV ZAMMAD_DIR /opt/zammad ENV ZAMMAD_READY_FILE ${ZAMMAD_DIR}/tmp/zammad.ready @@ -42,6 +42,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ ENV GIT_BRANCH stable ENV RAILS_ENV production +ENV RAILS_LOG_TO_STDOUT true ENV ZAMMAD_DIR /opt/zammad ENV ZAMMAD_READY_FILE ${ZAMMAD_DIR}/tmp/zammad.ready ENV ZAMMAD_TMP_DIR /tmp/zammad-${GIT_BRANCH} From fda5b3075c55da07758e132e57a2cc4d444228cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 28 Mar 2021 13:09:25 +0200 Subject: [PATCH 07/12] update to 4.0.0 (#198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .env | 2 +- Dockerfile | 2 +- containers/zammad-elasticsearch/Dockerfile | 2 +- containers/zammad-postgresql/Dockerfile | 2 +- containers/zammad/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 931481d..d0e4ab1 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-3.6.0-67 +VERSION=-4.0.0-7 diff --git a/Dockerfile b/Dockerfile index 4708c9b..ae96fd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="3.6.0" \ + org.label-schema.schema-version="4.0.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index a5c0623..79a2338 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -9,7 +9,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="3.6.0" \ + org.label-schema.schema-version="4.0.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile index eaf2906..4051919 100644 --- a/containers/zammad-postgresql/Dockerfile +++ b/containers/zammad-postgresql/Dockerfile @@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="3.6.0" \ + org.label-schema.schema-version="4.0.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index bb9f25e..634e3c4 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="3.6.0" \ + org.label-schema.schema-version="4.0.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" ENV GIT_BRANCH stable From 9dbd8624514d7b92fad4a8e0ca5ea88993d0e20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 1 Apr 2021 18:55:35 +0200 Subject: [PATCH 08/12] Update to 4.0.0-13 (#199) * Update .env * Update .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index d0e4ab1..28db321 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-4.0.0-7 +VERSION=-4.0.0-13 From 8eadbd39a1233d527dd6210667e0451e8eec221b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 8 Apr 2021 20:24:49 +0200 Subject: [PATCH 09/12] Update .env (#201) --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 28db321..b93fd7b 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-4.0.0-13 +VERSION=-4.0.0-20 From ccb9ca3226dbcef31f1a5b92fb829235bfcbc5ea Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 24 Apr 2021 15:20:03 +0200 Subject: [PATCH 10/12] Fixes #205 - Automatically remove IPv6 listen directive (#207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixes #205 - Automatically remove IPv6 listen directive * Update docker-entrypoint.sh Co-authored-by: André Bauer --- containers/zammad/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 9cc0c6c..2c0e850 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -121,7 +121,7 @@ if [ "$1" = 'zammad-nginx' ]; then check_zammad_ready # configure nginx - sed -e "s#listen .*#listen ${NGINX_PORT};#g" \ + sed -e "s#\(listen\)\(.*\)80#\1\2${NGINX_PORT}#g" \ -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \ -e "s#server .*:3000#server ${ZAMMAD_RAILSSERVER_HOST}:${ZAMMAD_RAILSSERVER_PORT}#g" \ -e "s#server .*:6042#server ${ZAMMAD_WEBSOCKET_HOST}:${ZAMMAD_WEBSOCKET_PORT}#g" \ From a77de6a442c2d3b009ca3baa066349dc22fbbbd1 Mon Sep 17 00:00:00 2001 From: olafbuitelaar Date: Sat, 24 Apr 2021 19:50:55 +0200 Subject: [PATCH 11/12] Update backup.sh (#204) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i suppose this change should be reflected here as well; https://github.com/zammad/zammad/commit/3d86eb8543ea0056c18671f92b5ccec6de8d7170 Co-authored-by: André Bauer --- containers/zammad-postgresql/backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad-postgresql/backup.sh b/containers/zammad-postgresql/backup.sh index 6774d76..6c570ee 100755 --- a/containers/zammad-postgresql/backup.sh +++ b/containers/zammad-postgresql/backup.sh @@ -24,7 +24,7 @@ function zammad_backup { # delete old backups if [ -d "${BACKUP_DIR}" ] && [ -n "$(ls "${BACKUP_DIR}")" ]; then - find "${BACKUP_DIR}"/*_zammad_*.gz -type f -mtime +"${HOLD_DAYS}" -exec rm {} \; + find "${BACKUP_DIR}"/*_zammad_*.gz -type f -mtime +"${HOLD_DAYS}" -delete fi if [ "${NO_FILE_BACKUP}" != "yes" ]; then From 3552f447baeab308d700875c9028e2ff82788b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 26 Apr 2021 16:39:53 +0200 Subject: [PATCH 12/12] update to 4.0.0-25 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index b93fd7b..5095332 100644 --- a/.env +++ b/.env @@ -3,4 +3,4 @@ POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-4.0.0-20 +VERSION=-4.0.0-25