2
0
Эх сурвалжийг харах

[SQL upgrade] Catch more errors

andryyy 6 жил өмнө
parent
commit
8c26371d6d

+ 1 - 1
data/Dockerfiles/dockerapi/server.py

@@ -228,7 +228,7 @@ class container_post(Resource):
           container.restart()
           return jsonify(type='warning', msg='mysql_upgrade: upgrade was applied', text=sql_return.output.decode('utf-8'))
       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

+ 2 - 1
data/Dockerfiles/phpfpm/docker-entrypoint.sh

@@ -57,7 +57,8 @@ until [[ ${SQL_UPGRADE_STATUS} == 'success' ]]; do
     echo "MySQL is up-to-date - debug output:"
     echo ${SQL_FULL_UPGRADE_RETURN}
   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
 done
 

+ 2 - 2
docker-compose.yml

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