feature

api.env

@@ -2,17 +2,11 @@ DB_HOST=mysql
 DB_PORT=3306
 DB_NAME=moneywhere
 DB_USER=root
-DB_PASSWORD=123456
+DB_PASSWORD=NWPkVrO2
 SERVER_PORT=9092
 DDL_AUTO=update
 SHOW_SQL=true
 
 invite_code=111111
 
-wxopen_appsecret=xxxxxxxxxxxx
-wxopen_appid=xxxxxxxxxxx
-wxopen_redirect_url=http://xxxxxxxxxxxx/api/v1/loginWechat/callback
-wxopen_appsecret_app=xxxxxxxxxxxxxx
-wxopen_appid_app=xxxxxxxxxxxxx
-
 user_api_base_url=https://api.moneywhere.com/api/v1/user-api/

docker-compose-bak.yml

@@ -0,0 +1,42 @@
+version: '3.6'
+
+services:
+  mysql:
+    build: ./mysql/
+    command: --init-file /data/1.sql
+    restart: always
+    environment:
+      - MYSQL_ROOT_PASSWORD=123456
+    volumes:
+      - moneywhere_mysql_data:/var/lib/mysql
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    links:
+      - mysql
+    ports:
+      - "8085:80"
+    environment:
+      PMA_ARBITRARY: 1
+      PMA_HOST: mysql
+      PMA_USER: root
+      PMA_PASSWORD: 123456
+
+  moneywhere-api-user:
+    depends_on:
+      - mysql
+    image: markliu2018/moneywhere-api-user:latest
+    env_file: api.env
+
+  moneywhere-fe-user:
+    depends_on:
+      - moneywhere-api-user
+    image: markliu2018/moneywhere-fe-user:latest
+    environment:
+      USER_API_HOST: http://moneywhere-api-user:9092
+      API_HOST: https://api.moneywhere.com/api/v1/user-api
+    ports:
+      - "9097:80"
+
+volumes:
+  moneywhere_mysql_data:

docker-compose-no-mysql.yml

@@ -2,8 +2,6 @@ version: '3.6'
 
 services:
   moneywhere-api-user:
-    depends_on:
-      - mysql
     image: markliu2018/moneywhere-api-user:latest
     env_file: api.env
 

docker-compose.yml

@@ -1,37 +1,38 @@
-version: '3.6'
+version: '3'
 
 services:
   mysql:
-    build: ./mysql/
-    command: --init-file /data/1.sql
-    restart: always
+    image: mysql:5.7
     environment:
-      - MYSQL_ROOT_PASSWORD=123456
+      MYSQL_ROOT_PASSWORD: NWPkVrO2
+      MYSQL_DATABASE: moneywhere
+      MYSQL_USER: moneywhere
+      MYSQL_PASSWORD: YR1IZ0HW
     volumes:
       - moneywhere_mysql_data:/var/lib/mysql
+    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_general_ci']
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
     links:
       - mysql
+    environment:
+      PMA_HOST: mysql
+      PMA_PORT: 3306
+      PMA_ARBITRARY: 1
+    restart: always
     ports:
       - "8085:80"
-    environment:
-      PMA_ARBITRARY: 1
-      PMA_HOST: mysql
-      PMA_USER: root
-      PMA_PASSWORD: 123456
 
   moneywhere-api-user:
     depends_on:
-      - mysql
-    links:
-      - mysql
+      mysql:
+        condition: service_healthy
     image: markliu2018/moneywhere-api-user:latest
     env_file: api.env
 
   moneywhere-fe-user:
-    depends_on:
+    links:
       - moneywhere-api-user
     image: markliu2018/moneywhere-fe-user:latest
     environment:

docker-compose2.yml

@@ -0,0 +1,44 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:5.7
+    environment:
+      MYSQL_ROOT_PASSWORD: my_secret_password
+      MYSQL_DATABASE: moneywhere
+      MYSQL_USER: db_user
+      MYSQL_PASSWORD: db_user_pass
+    volumes:
+      - moneywhere_mysql_data:/var/lib/mysql
+    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_general_ci']
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    links:
+      - mysql
+    environment:
+      PMA_HOST: mysql
+      PMA_PORT: 3306
+      PMA_ARBITRARY: 1
+    restart: always
+    ports:
+      - "8085:80"
+
+  moneywhere-api-user:
+    depends_on:
+      - mysql
+    image: markliu2018/moneywhere-api-user:latest
+    env_file: api.env
+
+  moneywhere-fe-user:
+    links:
+      - moneywhere-api-user
+    image: markliu2018/moneywhere-fe-user:latest
+    environment:
+      USER_API_HOST: http://moneywhere-api-user:9092
+      API_HOST: https://api.moneywhere.com/api/v1/user-api
+    ports:
+      - "9097:80"
+
+volumes:
+  moneywhere_mysql_data: