From a703b63cb1fc0a4c4644cdbd459c985ed0712876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek@users.noreply.github.com>
Date: Wed, 20 Oct 2021 13:35:09 +0200
Subject: [PATCH] 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