better error handling

2017-11-21 16:24:57 +01:00 · 2017-11-21 16:24:57 +01:00 · c93f1422b1
commit c93f1422b1
parent 9aa8a7540d
1 changed files with 3 additions and 4 deletions
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@ -23,17 +23,16 @@ if [ "$1" = 'zammad-railsserver' ]; then
  # db mirgrate
  set +e
  bundle exec rake db:migrate &> /dev/null
-
-  if [ $? != 0 ]; then
-    echo "creating db & searchindex..."
+  DB_CHECK="$?"
  set -e
+
+  if [ "${DB_CHECK}" != "0" ]; then
+    echo "creating db & searchindex..."
    bundle exec rake db:create
    bundle exec rake db:migrate
    bundle exec rake db:seed
  fi

-  set -e
-
  # es config
  bundle exec rails r "Setting.set('es_url', 'http://zammad-elasticsearch:9200')"
  bundle exec rake searchindex:rebuild