switch to develop branch until zammad 1.2 stable is ready

This commit is contained in:
André Bauer 2017-01-09 16:11:50 +01:00
parent 0a0c983cfb
commit cf5ab6ea95
2 changed files with 2 additions and 2 deletions

View File

@ -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" \

View File

@ -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