Update docker scripts

Author: wu-clan

backend/backend.dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.10-slim
 
+SHELL ["/bin/bash", "-c"]
+
 WORKDIR /fba
 
 COPY . .
@@ -9,13 +11,13 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debi
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gcc python3-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# 某些包可能存在同步不及时导致安装失败的情况，可更改为官方源：https://pypi.org/simple
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
-    && uv sync --group server --default-index https://mirrors.aliyun.com/pypi/simple
+    && rm -rf /var/lib/apt/lists/* \
+    # 某些包可能存在同步不及时导致安装失败的情况，可更改为官方源：https://pypi.org/simple
+    && pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple \
+    && pip install -r backend/requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
+    && pip install gunicorn aio_pika supervisor wait-for-it -i https://mirrors.aliyun.com/pypi/simple
 
-ENV TZ = Asia/Shanghai
+ENV TZ="Asia/Shanghai"
 
 RUN mkdir -p /var/log/fastapi_server
 

backend/celery.dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.10-slim
 
+SHELL ["/bin/bash", "-c"]
+
 WORKDIR /fba
 
 COPY . .
@@ -10,11 +12,12 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debi
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gcc python3-dev \
     && rm -rf /var/lib/apt/lists/* \
+    # 某些包可能存在同步不及时导致安装失败的情况，可更改为官方源：https://pypi.org/simple
+    && pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple \
+    && pip install -r backend/requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
+    && pip install gunicorn aio_pika supervisor wait-for-it -i https://mirrors.aliyun.com/pypi/simple
 
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
-    && uv sync --group server --default-index https://mirrors.aliyun.com/pypi/simple
-
-ENV TZ = Asia/Shanghai
+ENV TZ="Asia/Shanghai"
 
 RUN mkdir -p /var/log/celery
 

deploy/backend/docker-compose/.env.docker

@@ -1,3 +1,4 @@
 # Docker
 DOCKER_MYSQL_MAP_PORT=13306
+DOCKER_POSTGRES_MAP_PORT=15432
 DOCKER_REDIS_MAP_PORT=16379

deploy/backend/docker-compose/.env.server

@@ -1,10 +1,11 @@
 # Env: dev、pro
 ENVIRONMENT='dev'
-# MySQL
-MYSQL_HOST='fba_mysql'
-MYSQL_PORT=3306
-MYSQL_USER='root'
-MYSQL_PASSWORD='123456'
+# Database
+DATABASE_TYPE='mysql'
+DATABASE_HOST='fba_mysql'
+DATABASE_PORT=3306
+DATABASE_USER='root'
+DATABASE_PASSWORD='123456'
 # Redis
 REDIS_HOST='fba_redis'
 REDIS_PORT=6379

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

@@ -1,5 +1,3 @@
-version: "3.10"
-
 networks:
   fba_network:
     name: fba_network
@@ -42,7 +40,7 @@ services:
         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
-        supervisorctl restart fastapi_server
+        supervisorctl restart
 
   fba_mysql:
     image: mysql:8.0.29
@@ -67,15 +65,15 @@ services:
 #  fba_postgres:
 #    image: postgres:16
 #    ports:
-#      - "${DOCKER_MYSQL_MAP_PORT:-5432}:5432"
+#      - "${DOCKER_POSTGRES_MAP_PORT:-5432}:5432"
 #    container_name: fba_postgres
 #    restart: always
 #    environment:
 #      POSTGRES_DB: fba
 #      POSTGRES_PASSWORD: 123456
 #      TZ: Asia/Shanghai
 #    volumes:
-#      - fba_mysql:/var/lib/postgresql/data
+#      - fba_postgres:/var/lib/postgresql/data
 #    networks:
 #      - fba_network
 
@@ -165,6 +163,4 @@ services:
         wait-for-it -s fba_rabbitmq:5672 -t 300
         mkdir -p /var/log/supervisor/
         supervisord -c /fba/deploy/backend/supervisor.conf
-        supervisorctl restart celery_worker
-        supervisorctl restart celery_beat
-        supervisorctl restart celery_flower
+        supervisorctl restart