From 03469a625306ac6d9aefd61aaf2455f6984b61b6 Mon Sep 17 00:00:00 2001 From: YuevUwU <96368079+YuevUwU@users.noreply.github.com> Date: Mon, 2 Dec 2024 01:04:50 +0800 Subject: [PATCH] feat(docker): sync src on dev mode --- .docker/bot/Dockerfile | 10 ++++++++++ .docker/web/Dockerfile | 2 -- docker-compose.prod.yaml | 4 ++++ docker-compose.yaml | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.docker/bot/Dockerfile b/.docker/bot/Dockerfile index 38f223e..e281de1 100644 --- a/.docker/bot/Dockerfile +++ b/.docker/bot/Dockerfile @@ -9,6 +9,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt +FROM python:3.11-slim-bullseye AS development + +WORKDIR /app + +COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages +COPY --from=builder /usr/local/bin /usr/local/bin + +CMD ["python3", "main.py"] + + FROM python:3.11-slim-bullseye AS production WORKDIR /app diff --git a/.docker/web/Dockerfile b/.docker/web/Dockerfile index 7268a90..325cf57 100755 --- a/.docker/web/Dockerfile +++ b/.docker/web/Dockerfile @@ -17,8 +17,6 @@ WORKDIR /app COPY --from=builder /usr/local/bin /usr/local/bin COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages -COPY . . - ENV FLASK_APP=app.py ENV FLASK_ENV=development ENV FLASK_RUN_PORT=5000 diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 33bf512..fb86863 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -2,4 +2,8 @@ include: docker-compose.yaml services: web: + volumes: + target: production + bot: + volumes: target: production \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 983e3b1..80f224c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,6 +28,8 @@ services: restart: unless-stopped ports: - ${FLASK_HOST_PORT}:5000 + volumes: + - .:/app networks: - backnet - frontnet @@ -41,8 +43,10 @@ services: build: context: . dockerfile: .docker/bot/Dockerfile - target: production + target: development restart: unless-stopped + volumes: + - .:/app networks: - backnet depends_on: