From cf5ab6ea950a9a39c57372a0be81e6b55196a7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 9 Jan 2017 16:11:50 +0100 Subject: [PATCH] switch to develop branch until zammad 1.2 stable is ready --- Dockerfile.zammad | 2 +- install-zammad.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.zammad b/Dockerfile.zammad index 56e880e..a089eec 100644 --- a/Dockerfile.zammad +++ b/Dockerfile.zammad @@ -7,7 +7,7 @@ ENV ZAMMAD_DEBUG no ENV RAILS_ENV production ENV RAILS_SERVER puma ENV GIT_URL https://github.com/zammad/zammad.git -ENV GIT_BRANCH stable +ENV GIT_BRANCH develop LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.name="Zammad" \ diff --git a/install-zammad.sh b/install-zammad.sh index 388c6a2..6f8907e 100644 --- a/install-zammad.sh +++ b/install-zammad.sh @@ -9,7 +9,7 @@ cp -R /tmp/zammad/.[!.]* ${ZAMMAD_DIR} cd ${ZAMMAD_DIR} rm -rf /tmp/zammad bundle install --without test development mysql -test -f contrib/packager.io/fetch_locales.rb && contrib/packager.io/fetch_locales.rb +&& 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: postgresql\n#g' < config/database.yml.pkgr > config/database.yml bundle exec rake assets:precompile sed -e 's#.*adapter: postgresql# adapter: postgresql#g' -e 's#.*username:.*# username: postgres#g' -e 's#.*password:.*# password: \n host: postgresql\n#g' < config/database.yml.pkgr > config/database.yml