diff --git a/docker-compose.yml b/docker-compose.yml index 9a1aaab31..49e35da6b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: php: container_name: "dootask-php-${APP_ID}" - image: "kuaifan/php:swoole-8.0.rc5" + image: "kuaifan/php:swoole-8.0.rc6" shm_size: "1024m" volumes: - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf @@ -58,8 +58,8 @@ services: mariadb: container_name: "dootask-mariadb-${APP_ID}" image: "mariadb:10.7.3" - ports: # mysql ports item - - "33062:3306" # mysql ports value + ports: + - "${DB_OPEN_PORT:-}:3306" volumes: - ./docker/mysql/repassword.sh:/etc/mysql/repassword.sh - ./docker/mysql/conf.d:/etc/mysql/conf.d diff --git a/electron/package.json b/electron/package.json index b266a81ad..24d37729a 100644 --- a/electron/package.json +++ b/electron/package.json @@ -32,7 +32,7 @@ "@electron-forge/maker-squirrel": "^6.0.5", "@electron-forge/maker-zip": "^6.0.5", "dotenv": "^16.0.3", - "electron": "^23.1.1", + "electron": "^23.1.4", "electron-builder": "^23.6.0", "electron-notarize": "^1.2.2", "form-data": "^4.0.0",