Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deactivated set -e for db check

Browse Source
This commit is contained in:
André Bauer 2017-11-21 16:19:57 +01:00
parent 6d49d009ae
commit 9aa8a7540d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers/zammad-postgresql/backup.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
if [ "$1" = 'zammad-backup' ]; then if [ "$1" = 'zammad-backup' ]; then
# wait for zammad process coming up # wait for zammad process coming up
until (echo > /dev/tcp/zammad-railsserver/3000) &> /dev/null; do until (echo > /dev/tcp/zammad-railsserver/3000) &> /dev/null; do

4
containers/zammad/docker-entrypoint.sh
View File

@ -21,15 +21,19 @@ if [ "$1" = 'zammad-railsserver' ]; then
bundle install bundle install
# db mirgrate # db mirgrate
set +e
bundle exec rake db:migrate &> /dev/null bundle exec rake db:migrate &> /dev/null
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "creating db & searchindex..." echo "creating db & searchindex..."
set -e
bundle exec rake db:create bundle exec rake db:create
bundle exec rake db:migrate bundle exec rake db:migrate
bundle exec rake db:seed bundle exec rake db:seed
fi fi
set -e
# es config # es config
bundle exec rails r "Setting.set('es_url', 'http://zammad-elasticsearch:9200')" bundle exec rails r "Setting.set('es_url', 'http://zammad-elasticsearch:9200')"
bundle exec rake searchindex:rebuild bundle exec rake searchindex:rebuild