Merge branch 'main' of http://114.67.155.184:3000/hhhhhh/nonye

docker-compose.yml

@@ -1,22 +1,12 @@
-version: '3.8'
 services:
-  backend:
+  app:
-    build: ./back
+    build:
-    container_name: backend
+      context: .
+      dockerfile: Dockerfile
+    container_name: app
     ports:
-      - "7792:5000"
+      - "7792:7792"   # 前端
+      - "7793:7793"   # 后端
     volumes:
-      - ./back:/app
+      - ./back:/app/back
-    environment:
+      - ./platform:/app/platform 
-      - FLASK_ENV=development
-    depends_on:
-      - frontend
-  frontend:
-    build: ./platform
-    container_name: frontend
-    ports:
-      - "7793:5173"
-    volumes:
-      - ./platform:/app
-    environment:
-      - NODE_ENV=development 

supervisord.conf

@@ -3,7 +3,7 @@ nodaemon=true
 
 [program:frontend]
 directory=/app/platform
-command=http-server dist
+command=http-server dist -p 7792
 autostart=true
 autorestart=true
 stdout_logfile=/dev/stdout
@@ -11,7 +11,7 @@ stderr_logfile=/dev/stderr
 
 [program:backend]
 directory=/app/back
-command=python app.py
+command=python app.py --port=7793
 autostart=true
 autorestart=true
 stdout_logfile=/dev/stdout