create-aomex 0.0.43 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aomex",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",

package/templates/.env

@@ -1 +1 @@
-DATABASE_URL=mysql://root:abcde@localhost:3306/{{projectName}}
+DATABASE_URL=mysql://my_user:my_pwd@localhost:3306/{{projectName}}

package/templates/docker-compose.yml

@@ -2,14 +2,22 @@ services:
   mysql:
     image: mysql:8
     environment:
+      MYSQL_ROOT_PASSWORD: 'abcde'
       # 修改后需要同步修改.env里的参数
       MYSQL_DATABASE: '{{projectName}}'
-      MYSQL_ROOT_PASSWORD: 'abcde'
+      MYSQL_USER: 'my_user'
+      MYSQL_PASSWORD: 'my_pwd'
     volumes:
       - ./volumes/mysql:/var/lib/mysql
     ports:
       - 3306:3306
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    healthcheck:
+      test:
+        ['CMD', 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$$MYSQL_ROOT_PASSWORD']
+      interval: 3s
+      timeout: 5s
+      retries: 10
   mongo:
     image: mongo:7
     environment:

package/templates/scripts/start.mjs

@@ -3,15 +3,16 @@ import process from 'node:process';
 
 execSync('docker compose -f docker-compose.yml down', { stdio: 'inherit' });
 
-const docker = spawn('docker compose -f docker-compose.yml up', {
+const docker = spawn('docker compose -f docker-compose.yml up --timestamps --wait', {
   stdio: ['inherit', 'inherit', 'pipe'],
   shell: true,
 });
 
 await new Promise((resolve) => {
+  const reg = /mysql.+?healthy/i;
   docker.stderr.on('data', (chunk) => {
     process.stderr.write(chunk);
-    if (chunk.toString().includes('port: 3306  MySQL Community Server - GPL.')) {
+    if (reg.test(chunk.toString())) {
       resolve();
     }
   });