feat: update devcontainer and docker-compose

.devcontainer/devcontainer.json

@@ -11,11 +11,15 @@
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
-				"mongodb.mongodb-vscode"
+				// "mongodb.mongodb-vscode"
 			]
 		}
 	},
 
+	"forwardPorts": [
+		"phpmyadmin:80"
+	],
+
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node"
 }

docker-compose.yml

@@ -10,11 +10,19 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    # network_mode: service:db
+    # links:
+    #   - redis
+    #   - mysql
+    depends_on:
+      - mysql
+      - redis
     networks:
       - cnpm
 
+    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    # networks:
+    #   - cnpm
+
     # Uncomment the next line to use a non-root user for all processes.
     # user: node
 
@@ -28,7 +36,7 @@ services:
     volumes:
       - cnpm-redis:/data
     ports:
-      - 6379:6379
+      - 6379
     networks:
       - cnpm
 
@@ -37,17 +45,17 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD:
+      MYSQL_ROOT_PASSWORD: root
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-      # MYSQL_DATABASE: 'cnpmcore_unittest'
+      MYSQL_DATABASE: 'cnpmcore_unittest'
       MYSQL_USER: user
       MYSQL_PASSWORD: pass
     volumes:
       - cnpm-mysql:/var/lib/mysql
       # - ./conf.d/mysql/:/etc/mysql/conf.d
       # - ./init.d/mysql/:/docker-entrypoint-initdb.d
     ports:
-      - 3306:3306
+      - 3306
     networks:
       - cnpm
 
@@ -61,19 +69,18 @@ services:
       MYSQL_USER: user
       MYSQL_PASSWORD: pass
       PMA_HOST: 'mysql'
-    ports:
-      - 8080:80
-    networks:
-      - cnpm
     depends_on:
       - mysql
+    ports:
+      - 80
+    networks:
+      - cnpm      
 
 volumes:
   cnpm-redis:
   cnpm-mysql:
 
-
 networks:
   cnpm:
     name: cnpm
-    driver: bridge
+    driver: bridge

test/TestUtil.ts

@@ -42,10 +42,10 @@ export class TestUtil {
 
   static getMySqlConfig() {
     return {
-      host: process.env.MYSQL_HOST || 'localhost',
+      host: process.env.MYSQL_HOST || 'mysql',
       port: process.env.MYSQL_PORT || 3306,
       user: process.env.MYSQL_USER || 'root',
-      password: process.env.MYSQL_PASSWORD,
+      password: process.env.MYSQL_PASSWORD || '',
       multipleStatements: true,
     };
   }