Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[SQL upgrade] Catch more errors

Browse Source
This commit is contained in:
andryyy 2019-09-25 12:53:14 +02:00
parent 8b453ab803
commit 8c26371d6d
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/dockerapi/server.py
View File

@ -228,7 +228,7 @@ class container_post(Resource):
container.restart() container.restart()
return jsonify(type='warning', msg='mysql_upgrade: upgrade was applied', text=sql_return.output.decode('utf-8')) return jsonify(type='warning', msg='mysql_upgrade: upgrade was applied', text=sql_return.output.decode('utf-8'))
else: else:
return jsonify(type='error', msg='mysql_upgrade: error running command') return jsonify(type='error', msg='mysql_upgrade: error running command', text=sql_return.output.decode('utf-8'))
# api call: container_post - post_action: exec - cmd: reload - task: dovecot # api call: container_post - post_action: exec - cmd: reload - task: dovecot

3
data/Dockerfiles/phpfpm/docker-entrypoint.sh
View File

@ -57,7 +57,8 @@ until [[ ${SQL_UPGRADE_STATUS} == 'success' ]]; do
echo "MySQL is up-to-date - debug output:" echo "MySQL is up-to-date - debug output:"
echo ${SQL_FULL_UPGRADE_RETURN} echo ${SQL_FULL_UPGRADE_RETURN}
else else
echo "No valid reponse for mysql_upgrade was received" echo "No valid reponse for mysql_upgrade was received, debug output:"
echo ${SQL_FULL_UPGRADE_RETURN}
fi fi
done done

4
docker-compose.yml
View File

@ -95,7 +95,7 @@ services:
- rspamd - rspamd
php-fpm-mailcow: php-fpm-mailcow:
image: mailcow/phpfpm:1.46 image: mailcow/phpfpm:1.47
build: ./data/Dockerfiles/phpfpm build: ./data/Dockerfiles/phpfpm
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on: depends_on:
@ -394,7 +394,7 @@ services:
- watchdog - watchdog
dockerapi-mailcow: dockerapi-mailcow:
image: mailcow/dockerapi:1.33 image: mailcow/dockerapi:1.34
restart: always restart: always
build: ./data/Dockerfiles/dockerapi build: ./data/Dockerfiles/dockerapi
oom_kill_disable: true oom_kill_disable: true