From 4b22c2e442f7cffa1a43d29d1030831522e985b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 13 Oct 2021 15:55:25 +0200 Subject: [PATCH 1/4] update to version 5.0.1-5 (#245) --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 5e8f864..992c765 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=-5.0.1-1 +VERSION=-5.0.1-5 From c5a6f5afec769376ecb76e881ef986b40d19ae19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 18 Oct 2021 23:45:56 +0200 Subject: [PATCH 2/4] update elasticsearch to 7.15.1 (non oss) (#248) * Update Dockerfile * Update Dockerfile --- containers/zammad-elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index 7101c51..e2e3cd4 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.15.1 ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ From 01daa74920d504e67010adb376e1f523854f93db Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Tue, 19 Oct 2021 11:53:10 +0200 Subject: [PATCH 3/4] Maintenance: Clean-up unneeded test files during the build process. (#249) --- containers/zammad/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index fb41642..0cc25cb 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -24,6 +24,7 @@ if [ "$1" = 'builder' ]; then tar -xzf zammad-"${GIT_BRANCH}".tar.gz rm zammad-"${GIT_BRANCH}".tar.gz cd "${ZAMMAD_TMP_DIR}" + script/build/cleanup.sh bundle install --without test development mysql 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 From a703b63cb1fc0a4c4644cdbd459c985ed0712876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 20 Oct 2021 13:35:09 +0200 Subject: [PATCH 4/4] remove without from bundle command (#250) * remove without from bundle command * fix quote --- containers/zammad/setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 0cc25cb..7f21df1 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -24,8 +24,8 @@ if [ "$1" = 'builder' ]; then tar -xzf zammad-"${GIT_BRANCH}".tar.gz rm zammad-"${GIT_BRANCH}".tar.gz cd "${ZAMMAD_TMP_DIR}" - script/build/cleanup.sh - bundle install --without test development mysql + bundle config set without 'test development mysql' + bundle install 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 @@ -33,6 +33,7 @@ if [ "$1" = 'builder' ]; then touch db/schema.rb bundle exec rake assets:precompile rm -r tmp/cache + script/build/cleanup.sh chown -R "${ZAMMAD_USER}":"${ZAMMAD_USER}" "${ZAMMAD_TMP_DIR}" fi