merged master

2017-11-21 16:26:34 +01:00 · 2017-11-21 16:26:34 +01:00 · 991cb6aaae
commit 991cb6aaae
parent 4ec18cd437 c93f1422b1
1 changed files with 4 additions and 1 deletions
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@ -35,9 +35,12 @@ if [ "$1" = 'zammad-railsserver' ]; then
  mount_nfs

  # db mirgrate
+  set +e
  bundle exec rake db:migrate &> /dev/null
+  DB_CHECK="$?"
+  set -e

-  if [ $? != 0 ]; then
+  if [ "${DB_CHECK}" != "0" ]; then
    echo "creating db & searchindex..."
    bundle exec rake db:create
    bundle exec rake db:migrate