From c38c45d629a9320b007406aee19f64701b58186e Mon Sep 17 00:00:00 2001 From: Michael Gorbunov Date: Sat, 18 Jan 2025 13:12:47 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=B7=D0=B0=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D0=BA,=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/drf_ci.yml | 1 + docker-compose.yml | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/drf_ci.yml b/.github/workflows/drf_ci.yml index 42aef87..aba4b6f 100644 --- a/.github/workflows/drf_ci.yml +++ b/.github/workflows/drf_ci.yml @@ -121,6 +121,7 @@ jobs: run: | ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SERVER_IP }} << 'EOF' cd ${{ secrets.DEPLOY_DIR }} + docker compose down --rmi local || true docker compose build docker compose up -d EOF diff --git a/docker-compose.yml b/docker-compose.yml index 4209cb9..042be32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,16 @@ services: - redis - app - db - + nginx: + container_name: nginx-proxy-server + build: ./nginx + image: ${DOCKER_HUB_USER}/cw_drf-nginx:latest + ports: + - 80:80 + depends_on: + - app + volumes: + - ./static:/mysite/static volumes: pg_data: