Optimize docker deploy settings and scripts (#486)

deploy/backend/docker-compose/docker-compose.yml

@@ -1,22 +1,3 @@
-networks:
-  fba_network:
-    name: fba_network
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.10.10.0/24
-
-volumes:
-  fba_mysql:
-    name: fba_mysql
-  fba_redis:
-    name: fba_redis
-  fba_static:
-    name: fba_static
-  fba_rabbitmq:
-    name: fba_rabbitmq
-
 services:
   fba_server:
     build:
@@ -38,8 +19,7 @@ services:
       - -c
       - |
         wait-for-it -s fba_mysql:3306 -s fba_redis:6379 -t 300
-        mkdir -p /var/log/supervisor/
-        supervisord -c /fba/deploy/backend/supervisor.conf
+        supervisord -c /etc/supervisor/supervisord.conf
         supervisorctl restart
 
   fba_mysql:
@@ -62,20 +42,20 @@ services:
       --collation-server=utf8mb4_general_ci
       --lower_case_table_names=1
 
-#  fba_postgres:
-#    image: postgres:16
-#    ports:
-#      - "${DOCKER_POSTGRES_MAP_PORT:-5432}:5432"
-#    container_name: fba_postgres
-#    restart: always
-#    environment:
-#      POSTGRES_DB: fba
-#      POSTGRES_PASSWORD: 123456
-#      TZ: Asia/Shanghai
-#    volumes:
-#      - fba_postgres:/var/lib/postgresql/data
-#    networks:
-#      - fba_network
+  #  fba_postgres:
+  #    image: postgres:16
+  #    ports:
+  #      - "${DOCKER_POSTGRES_MAP_PORT:-5432}:5432"
+  #    container_name: fba_postgres
+  #    restart: always
+  #    environment:
+  #      POSTGRES_DB: fba
+  #      POSTGRES_PASSWORD: 123456
+  #      TZ: Asia/Shanghai
+  #    volumes:
+  #      - fba_postgres:/var/lib/postgresql/data
+  #    networks:
+  #      - fba_network
 
   fba_redis:
     image: redis:6.2.7
@@ -99,33 +79,33 @@ services:
     depends_on:
       - fba_server
     volumes:
-      - ../nginx.conf:/etc/nginx/nginx.conf:ro
+      - ../nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - fba_static:/www/fba_server/backend/static
     networks:
       - fba_network
 
-#  fba_ui:
-#    build:
-#      context: /root/fastapi_best_architecture_ui
-#      dockerfile: Dockerfile
-#    image: fba_ui:latest
-#    ports:
-#      - "80:80"
-#      - "443:443"
-#    container_name: fba_ui
-#    restart: always
-#    depends_on:
-#      - fba_server
-#    command:
-#      - nginx
-#      - -g
-#      - daemon off;
-#    volumes:
-#      # - local_ssl_pem_path:/etc/ssl/xxx.pem
-#      # - local_ssl_key_path:/etc/ssl/xxx.key
-#      - fba_static:/www/fba_server/backend/static
-#    networks:
-#      - fba_network
+  #  fba_ui:
+  #    build:
+  #      context: /root/fastapi_best_architecture_ui
+  #      dockerfile: Dockerfile
+  #    image: fba_ui:latest
+  #    ports:
+  #      - "80:80"
+  #      - "443:443"
+  #    container_name: fba_ui
+  #    restart: always
+  #    depends_on:
+  #      - fba_server
+  #    command:
+  #      - nginx
+  #      - -g
+  #      - daemon off;
+  #    volumes:
+  #      # - local_ssl_pem_path:/etc/ssl/xxx.pem
+  #      # - local_ssl_key_path:/etc/ssl/xxx.key
+  #      - fba_static:/www/fba_server/backend/static
+  #    networks:
+  #      - fba_network
 
   fba_rabbitmq:
     hostname: fba_rabbitmq
@@ -161,6 +141,24 @@ services:
       - -c
       - |
         wait-for-it -s fba_rabbitmq:5672 -t 300
-        mkdir -p /var/log/supervisor/
-        supervisord -c /fba/deploy/backend/supervisor.conf
+        supervisord -c /etc/supervisor/supervisord.conf
         supervisorctl restart
+
+networks:
+  fba_network:
+    name: fba_network
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.10.10.0/24
+
+volumes:
+  fba_mysql:
+    name: fba_mysql
+  fba_redis:
+    name: fba_redis
+  fba_static:
+    name: fba_static
+  fba_rabbitmq:
+    name: fba_rabbitmq