From 9aad202b600600f02964c29ffdb22c539da99297 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Tue, 5 Oct 2021 21:25:26 +0200 Subject: [PATCH 1/7] Changes for Zammad 5 (#219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * FillDB was renamed to FillDb for Zammad 5. * Changed Ruby dependency to 2.7.3. * Update containers/zammad/Dockerfile * added redis / changed memcached Signed-off-by: André Bauer * update memcached Signed-off-by: André Bauer * fix image Signed-off-by: André Bauer * remove nginx duplicate Signed-off-by: André Bauer * added nodejs Signed-off-by: André Bauer * added cache clear and removed links Signed-off-by: André Bauer * fix typo Signed-off-by: André Bauer Co-authored-by: André Bauer Co-authored-by: André Bauer --- .github/tests.sh | 10 ++++----- README.md | 5 +++++ containers/zammad/Dockerfile | 4 ++-- containers/zammad/docker-entrypoint.sh | 8 +++---- containers/zammad/setup.sh | 2 +- docker-compose.yml | 31 +++++++++----------------- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/.github/tests.sh b/.github/tests.sh index 1f633f8..96fafc0 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -19,20 +19,20 @@ echo echo "Success - Zammad is up :)" echo -echo +echo echo "Execute autowizard..." echo docker exec zammad-docker-compose_zammad-railsserver_1 rake zammad:setup:auto_wizard -echo +echo echo "Autowizard executed successful :)" -echo +echo -echo +echo echo "Fill DB with some random data" -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 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 :)" diff --git a/README.md b/README.md index 2c7542b..6844c51 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` adapt to `MEMCACHE_SERVERS`. +Redis is a dependency for the Websocket server now. diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index ef28b61..d599e1b 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -1,6 +1,6 @@ -FROM ruby:2.6.8-slim AS builder # note: zammad is currently incompatible to alpine because of: # https://github.com/docker-library/ruby/issues/113 +FROM ruby:2.7.4-slim AS builder ARG BUILD_DATE ARG DEBIAN_FRONTEND=noninteractive @@ -24,7 +24,7 @@ RUN chmod +x /tmp/setup.sh; \ /tmp/setup.sh builder -FROM ruby:2.6.8-slim +FROM ruby:2.7.4-slim ARG BUILD_DATE ARG DEBIAN_FRONTEND=noninteractive diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 619cbd1..b3d467a 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -10,8 +10,7 @@ set -e : "${ELASTICSEARCH_NAMESPACE:=zammad}" : "${ELASTICSEARCH_REINDEX:=true}" : "${ELASTICSEARCH_SSL_VERIFY:=true}" -: "${MEMCACHED_HOST:=zammad-memcached}" -: "${MEMCACHED_PORT:=11211}" +: "${MEMCACHE_SERVERS:=zammad-memcached:11211}" : "${NGINX_PORT:=8080}" : "${NGINX_SERVER_NAME:=_}" : "${NGINX_SERVER_SCHEME:=\$scheme}" @@ -22,6 +21,7 @@ set -e : "${POSTGRESQL_DB:=zammad_production}" : "${POSTGRESQL_DB_CREATE:=true}" : "${RAILS_TRUSTED_PROXIES:=['127.0.0.1', '::1']}" +: "${REDIS_URL:=redis://zammad-redis:6379}" : "${RSYNC_ADDITIONAL_PARAMS:=--no-perms --no-owner}" : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}" : "${ZAMMAD_RAILSSERVER_PORT:=3000}" @@ -58,9 +58,6 @@ if [ "$1" = 'zammad-init' ]; then ESCAPED_POSTGRESQL_PASS=$(echo "$POSTGRESQL_PASS" | sed -e 's/[\/&]/\\&/g') sed -e "s#.*adapter:.*# adapter: postgresql#g" -e "s#.*database:.*# database: ${POSTGRESQL_DB}#g" -e "s#.*username:.*# username: ${POSTGRESQL_USER}#g" -e "s#.*password:.*# password: ${ESCAPED_POSTGRESQL_PASS}\\n host: ${POSTGRESQL_HOST}\\n port: ${POSTGRESQL_PORT}#g" < contrib/packager.io/database.yml.pkgr > config/database.yml - # configure memcache - sed -i -e "s/.*config.cache_store.*file_store.*cache_file_store.*/ config.cache_store = :dalli_store, '${MEMCACHED_HOST}:${MEMCACHED_PORT}'\\n config.session_store = :dalli_store, '${MEMCACHED_HOST}:${MEMCACHED_PORT}'/" config/application.rb - # configure trusted proxies sed -i -e "s#config.action_dispatch.trusted_proxies =.*#config.action_dispatch.trusted_proxies = ${RAILS_TRUSTED_PROXIES}#" config/environments/production.rb @@ -78,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/containers/zammad/setup.sh b/containers/zammad/setup.sh index 47160f3..fb41642 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 shared-mime-info" + PACKAGES="build-essential curl git libimlib2-dev libpq-dev nodejs shared-mime-info" elif [ "$1" = 'runner' ]; then PACKAGES="curl libimlib2 libpq5 nginx rsync" fi diff --git a/docker-compose.yml b/docker-compose.yml index 7c3b90d..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,16 +35,13 @@ 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 zammad-memcached: command: memcached -m 256M - image: memcached:1.6.9-alpine + image: memcached:1.6.10-alpine restart: ${RESTART} zammad-nginx: @@ -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,25 +69,23 @@ 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 + zammad-redis: + image: redis:6.2.5-alpine + restart: ${RESTART} + zammad-scheduler: command: ["zammad-scheduler"] depends_on: - zammad-memcached - zammad-railsserver + - zammad-redis image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-elasticsearch - - zammad-memcached - - zammad-postgresql restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -104,10 +95,8 @@ services: depends_on: - zammad-memcached - zammad-railsserver + - zammad-redis image: ${IMAGE_REPO}:zammad${VERSION} - links: - - zammad-postgresql - - zammad-memcached restart: ${RESTART} volumes: - zammad-data:/opt/zammad From 11db944a4d553ff499c136c38ae47fd3aabf428f Mon Sep 17 00:00:00 2001 From: Thorsten <3873515+thorsteneckel@users.noreply.github.com> Date: Tue, 5 Oct 2021 21:41:40 +0200 Subject: [PATCH 2/7] Applied workaround required for Rails update Cache issue (#238) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/zammad/zammad/issues/3786 / https://github.com/zammad/zammad/issues/3759 Co-authored-by: André Bauer From b531521da809fca4e0c4d3d2bfff1e5b21f22812 Mon Sep 17 00:00:00 2001 From: Arnaud Veron Date: Tue, 5 Oct 2021 21:59:47 +0200 Subject: [PATCH 3/7] Fix error "base64: invalid input" causing init container crash (#232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix error "base64: invalid input" causing init container crash Fixes zammad/zammad-docker-compose#231 * Update containers/zammad/docker-entrypoint.sh * Update containers/zammad/docker-entrypoint.sh Co-authored-by: André Bauer --- containers/zammad/docker-entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index b3d467a..9d5079e 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -71,8 +71,9 @@ if [ "$1" = 'zammad-init' ]; then bundle exec rake db:seed # create autowizard.json on first install - if [ -n "${AUTOWIZARD_JSON}" ]; then - echo "${AUTOWIZARD_JSON}" | base64 -d > auto_wizard.json + if base64 -d <<< ${AUTOWIZARD_JSON} &>> /dev/null; then + echo "Saving autowizard json payload..." + base64 -d <<< "${AUTOWIZARD_JSON}" > auto_wizard.json fi else bundle exec rails r "Cache.clear" From 701627f9c6c759479d090deb68dd04dada597228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 5 Oct 2021 22:20:00 +0200 Subject: [PATCH 4/7] update zammad labels to 5.0.0 (#239) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * FillDB was renamed to FillDb for Zammad 5. * Changed Ruby dependency to 2.7.3. * Update containers/zammad/Dockerfile * added redis / changed memcached Signed-off-by: André Bauer * update memcached Signed-off-by: André Bauer * fix image Signed-off-by: André Bauer * remove nginx duplicate Signed-off-by: André Bauer * added nodejs Signed-off-by: André Bauer * added cache clear and removed links Signed-off-by: André Bauer * fix typo Signed-off-by: André Bauer * update zammmad version label to 5.0.0 Signed-off-by: André Bauer Co-authored-by: Martin Gruner Co-authored-by: Martin Gruner --- Dockerfile | 2 +- containers/zammad-elasticsearch/Dockerfile | 2 +- containers/zammad-postgresql/Dockerfile | 2 +- containers/zammad/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5dc93dc..3722772 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="4.1.0" \ + org.label-schema.schema-version="5.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 a9b48b2..94ed2aa 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="4.1.0" \ + org.label-schema.schema-version="5.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 2041206..7962097 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="4.1.0" \ + org.label-schema.schema-version="5.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 d599e1b..4916d3d 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="4.1.0" \ + org.label-schema.schema-version="5.0.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" ENV GIT_BRANCH stable From defd3fbdcf0fbb52af541fd1d6f3285f6501aece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 6 Oct 2021 14:16:13 +0200 Subject: [PATCH 5/7] fix in memory db usage (#241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix in memeory db Signed-off-by: André Bauer * fix linter Signed-off-by: André Bauer * disable jscpd Signed-off-by: André Bauer * added env to init container too Signed-off-by: André Bauer * remove whitespaces Signed-off-by: André Bauer * fix typo Signed-off-by: André Bauer --- .env | 2 ++ .github/workflows/ci.yaml | 2 ++ containers/zammad/docker-entrypoint.sh | 2 -- docker-compose.yml | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.env b/.env index ad4a3d7..b536d1b 100644 --- a/.env +++ b/.env @@ -1,6 +1,8 @@ IMAGE_REPO=zammad/zammad-docker-compose +MEMCACHE_SERVERS=zammad-memcached:11211 POSTGRES_PASS=zammad POSTGRES_USER=zammad +REDIS_URL=redis://zammad-redis:6379 RESTART=always # don't forget to add the minus before the version VERSION=-4.1.0-6 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff9ea53..a38570f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,6 +38,8 @@ jobs: env: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_JSCPD: false + build-and-run-docker-compose: needs: diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 9d5079e..56736f1 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -10,7 +10,6 @@ set -e : "${ELASTICSEARCH_NAMESPACE:=zammad}" : "${ELASTICSEARCH_REINDEX:=true}" : "${ELASTICSEARCH_SSL_VERIFY:=true}" -: "${MEMCACHE_SERVERS:=zammad-memcached:11211}" : "${NGINX_PORT:=8080}" : "${NGINX_SERVER_NAME:=_}" : "${NGINX_SERVER_SCHEME:=\$scheme}" @@ -21,7 +20,6 @@ set -e : "${POSTGRESQL_DB:=zammad_production}" : "${POSTGRESQL_DB_CREATE:=true}" : "${RAILS_TRUSTED_PROXIES:=['127.0.0.1', '::1']}" -: "${REDIS_URL:=redis://zammad-redis:6379}" : "${RSYNC_ADDITIONAL_PARAMS:=--no-perms --no-owner}" : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}" : "${ZAMMAD_RAILSSERVER_PORT:=3000}" diff --git a/docker-compose.yml b/docker-compose.yml index a3a1393..621c6f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,8 +32,10 @@ services: depends_on: - zammad-postgresql environment: + - MEMCACHE_SERVERS=${MEMCACHE_SERVERS} - POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_PASS=${POSTGRES_PASS} + - REDIS_URL=${REDIS_URL} image: ${IMAGE_REPO}:zammad${VERSION} restart: on-failure volumes: @@ -70,6 +72,9 @@ services: - zammad-memcached - zammad-postgresql - zammad-redis + environment: + - MEMCACHE_SERVERS=${MEMCACHE_SERVERS} + - REDIS_URL=${REDIS_URL} image: ${IMAGE_REPO}:zammad${VERSION} restart: ${RESTART} volumes: @@ -85,6 +90,9 @@ services: - zammad-memcached - zammad-railsserver - zammad-redis + environment: + - MEMCACHE_SERVERS=${MEMCACHE_SERVERS} + - REDIS_URL=${REDIS_URL} image: ${IMAGE_REPO}:zammad${VERSION} restart: ${RESTART} volumes: @@ -96,6 +104,9 @@ services: - zammad-memcached - zammad-railsserver - zammad-redis + environment: + - MEMCACHE_SERVERS=${MEMCACHE_SERVERS} + - REDIS_URL=${REDIS_URL} image: ${IMAGE_REPO}:zammad${VERSION} restart: ${RESTART} volumes: From cda3c41c7a37bd4dec99c2938e88d7a607344300 Mon Sep 17 00:00:00 2001 From: Thorsten <3873515+thorsteneckel@users.noreply.github.com> Date: Fri, 8 Oct 2021 12:35:34 +0200 Subject: [PATCH 6/7] Release Update 5.0.1. (#243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Release Update 5.0.1. * Update .env Co-authored-by: Thorsten Eckel <{ID}+{username}@users.noreply.github.com> Co-authored-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 b536d1b..5e8f864 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ POSTGRES_USER=zammad REDIS_URL=redis://zammad-redis:6379 RESTART=always # don't forget to add the minus before the version -VERSION=-4.1.0-6 +VERSION=-5.0.1-1 diff --git a/Dockerfile b/Dockerfile index 3722772..733cba4 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="5.0.0" \ + org.label-schema.schema-version="5.0.1" \ 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 94ed2aa..7101c51 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="5.0.0" \ + org.label-schema.schema-version="5.0.1" \ 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 7962097..b931722 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="5.0.0" \ + org.label-schema.schema-version="5.0.1" \ 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 4916d3d..173c6f1 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="5.0.0" \ + org.label-schema.schema-version="5.0.1" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" ENV GIT_BRANCH stable From 745868664391318f4405e34a0ac5a0ad345d4163 Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Fri, 8 Oct 2021 12:35:55 +0200 Subject: [PATCH 7/7] set same version in all docker-compose files (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: André Bauer --- docker-compose.override-local.yml | 2 +- docker-compose.override.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.override-local.yml b/docker-compose.override-local.yml index 26a0ebf..14baddf 100644 --- a/docker-compose.override-local.yml +++ b/docker-compose.override-local.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c685a51..f7888bb 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: zammad-nginx: