update

docker-compose.yml

@@ -8,40 +8,39 @@ x-logging: &default-logging
 
 networks:
   backend:
-    driver: ${NETWORKS_DRIVER}
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.10.10.0/24
+    driver: bridge
+    # ipam:
+    #   driver: default
+    #   config:
+    #     - subnet: 172.10.10.0/24
 
 volumes:
   mysql:
-    driver: ${VOLUMES_DRIVER}
+    driver: local
   redis:
-    driver: ${VOLUMES_DRIVER}
+    driver: local
+  minio:
+    driver: local
 
 services:
   ### PlayEdu ################################################
   playedu:
-    image: registry.cn-hangzhou.aliyuncs.com/xiaoteng/playedu-light:1.0-beta.5
+    image: registry.cn-hangzhou.aliyuncs.com/playedu/light:1.0-beta.7
     restart: always
     volumes:
-      - ${DATA_PATH}/logs/nginx:/var/log/nginx
+      - ./data/logs/nginx:/var/log/nginx
     environment:
-      - DB_HOST=${MYSQL_HOST:-mysql}
-      - DB_PORT=${MYSQL_PORT:-3306}
-      - DB_DATABASE=${MYSQL_DATABASE:-playedu}
-      - DB_USERNAME=${MYSQL_USER:-root}
-      - DB_PASSWORD=${MYSQL_ROOT_PASSWORD:-playedu-root-password}
-      - REDIS_HOST=${REDIS_HOST:-redis}
-      - REDIS_AUTH=${REDIS_PASS:-(null)}
-      - REDIS_PORT=${REDIS_PORT:-6379}
-      - MINIO_USER=${MINIO_ROOT_USER:-playedu}
-      - MINIO_PASS=${MINIO_ROOT_PASSWORD:-playedu-password}
-      - MINIO_END_POINT=${PLAYEDU_MINIO_ENDPOINT}
-      - MINIO_BUCKET=${MINIO_BUCKET:-playedu}
-      - MINIO_DOMAIN=${PLAYEDU_MINIO_DOMAIN}
+      - DB_HOST=mysql
+      - DB_PORT=3306
+      - DB_NAME=playedu
+      - DB_USER=root
+      - DB_PASS=playeduxyz
+      - REDIS_HOST=redis
+      - REDIS_PASS=playeduxyz
+      - REDIS_PORT=6379
+      - SA_TOKEN_JWT_SECRET_KEY=${PLAYEDU_JWT_KEY:-playeduxyz}
     ports:
+      - "${PLAYEDU_API_PORT:-9700}:80"
       - "${PLAYEDU_PC_PORT:-9800}:9800"
       - "${PLAYEDU_ADMIN_PORT:-9900}:9900"
     networks:
@@ -49,6 +48,7 @@ services:
     depends_on:
       - mysql
       - redis
+      - minio
     logging: *default-logging
 
   ### Redis ################################################
@@ -56,7 +56,7 @@ services:
     build: ./redis
     restart: always
     volumes:
-      - ${DATA_PATH}/redis:/data
+      - ./data/redis:/data
     ports:
       - "${REDIS_PORT:-6379}:6379"
     networks:
@@ -65,36 +65,33 @@ services:
 
   ### MySQL ################################################
   mysql:
-    build:
-      context: ./mysql
+    build: ./mysql
     restart: always
     environment:
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-playedu}
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-playedu-root-password}
-      - TZ=${TIMEZONE}
+      - MYSQL_DATABASE=playedu
+      - MYSQL_ROOT_PASSWORD=playeduxyz
+      - TZ=UTC
     volumes:
-      - ${DATA_PATH}/mysql:/var/lib/mysql
+      - ./data/mysql:/var/lib/mysql
     ports:
       - "${MYSQL_PORT:-3306}:3306"
     networks:
       - backend
     logging: *default-logging
-  
+
   ### Minio ################################################
   minio:
-    build:
-      context: ./minio
+    image: bitnami/minio:latest
     restart: always
     environment:
-      - MINIO_ROOT_USER=${MINIO_ROOT_USER:-playedu}
-      - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-playedu-password}
+      - MINIO_ROOT_USER=${MINIO_ROOT_USER:-username}
+      - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-password}
+      - MINIO_DEFAULT_BUCKETS=${MINIO_BUCKET:-playedu:public}
     volumes:
-      - ${DATA_PATH}/minio/data:/data
-      - ${DATA_PATH}/minio/config:/root/.minio
+      - ./data/minio/data:/data
     ports:
       - "${MINIO_PORT:-9000}:9000"
-      - "${MINIO_CONSOLE_PORT:-50000}:50000"
+      - "${MINIO_CONSOLE_PORT:-9001}:9001"
     networks:
       - backend
     logging: *default-logging
-