From 05434b619c4c0360fd17c68dd790083da873382d Mon Sep 17 00:00:00 2001 From: Valery Klachkov Date: Wed, 25 Sep 2024 17:05:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=B8=D1=81=D0=B5=D0=BC=20=D0=B8=D0=B7=20docker?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/.dockerignore | 5 +++-- backend/Dockerfile | 2 +- backend/scripts/send_participants_codes.py | 2 +- docker-compose.yml | 2 ++ frontend/.dockerignore | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/.dockerignore b/backend/.dockerignore index 7be846b..9c4bdb7 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -1,2 +1,3 @@ -target -.vscode \ No newline at end of file +.vscode +target* +Dockerfile diff --git a/backend/Dockerfile b/backend/Dockerfile index 8311538..b8be06f 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -6,7 +6,7 @@ RUN cargo build --release FROM debian:bookworm-slim -RUN apt-get update && apt-get install -y libpq-dev +RUN apt-get update && apt-get install -y ca-certificates libpq-dev COPY --from=builder /app/target/release/backend /bin diff --git a/backend/scripts/send_participants_codes.py b/backend/scripts/send_participants_codes.py index 63afc46..6b1c719 100644 --- a/backend/scripts/send_participants_codes.py +++ b/backend/scripts/send_participants_codes.py @@ -31,7 +31,7 @@ id = participant["id"] code = participant["code"] - if id <= 60: + if id <= 61: print(f"Письмо на почту {email} уже отправлено") continue diff --git a/docker-compose.yml b/docker-compose.yml index 6c6cc02..34d8f52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,8 @@ services: - NOTISEND_TOKEN=${NOTISEND_TOKEN} volumes: - "backend-data:/var/lib/backend" + ports: + - 8833:80 networks: - postgres labels: diff --git a/frontend/.dockerignore b/frontend/.dockerignore index 3952694..88649ee 100644 --- a/frontend/.dockerignore +++ b/frontend/.dockerignore @@ -1,3 +1,4 @@ +.vscode dist node_modules -.vscode \ No newline at end of file +Dockerfile \ No newline at end of file