diff --git a/deployment/docker/datamate/docker-compose.yml b/deployment/docker/datamate/docker-compose.yml index 8ee90abc..422f5bd8 100644 --- a/deployment/docker/datamate/docker-compose.yml +++ b/deployment/docker/datamate/docker-compose.yml @@ -47,7 +47,6 @@ services: - "30000:80" # nodePort → hostPort volumes: - frontend_log_volume:/var/log/datamate/frontend - - ./backend.conf:/etc/nginx/conf.d/backend.conf networks: [ datamate ] depends_on: - datamate-backend diff --git a/scripts/images/frontend/Dockerfile b/scripts/images/frontend/Dockerfile index 80968d01..db19a567 100644 --- a/scripts/images/frontend/Dockerfile +++ b/scripts/images/frontend/Dockerfile @@ -10,6 +10,7 @@ RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi && \ FROM nginx:1.29 AS runner COPY --from=builder /app/dist /opt/frontend +COPY deployment/docker/datamate/backend.conf /etc/nginx/conf.d/backend.conf RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && rm -f /etc/nginx/conf.d/default.conf