From f13fe8e8cec5a3afa66077269c8f2e82179c58e3 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 17:56:48 +0300 Subject: [PATCH 01/25] add swag --- infra/docker-compose.swag.yml | 61 +++++++++++++++++++++++++++++++++++ infra/swag_nginx.conf | 29 +++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 infra/docker-compose.swag.yml create mode 100644 infra/swag_nginx.conf diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml new file mode 100644 index 00000000..afc45915 --- /dev/null +++ b/infra/docker-compose.swag.yml @@ -0,0 +1,61 @@ +version: "3.8" + + + +services: + backend: + image: ghcr.io/studio-yandex-practicum/procharity_back_2.0_backend:latest + container_name: procharity_bot_backend + restart: always + depends_on: + postgres: + condition: service_healthy + ports: + - "8000:8000" + env_file: + - ../.env + + postgres: + image: postgres:13.2 + container_name: procharity_postgres + restart: always + user: postgres + volumes: + - postgres_data:/var/lib/postgresql/data/ + env_file: + - ../.env + healthcheck: + test: [ "CMD-SHELL", "pg_isready" ] + interval: 10s + timeout: 5s + retries: 5 + + swag: + image: lscr.io/linuxserver/swag:2.4.0 + container_name: procharity_swag + cap_add: + - NET_ADMIN + environment: + - TZ=Europe/Moscow + - URL=e2e5-185-119-1-24.ngrok-free.app + - VALIDATION=http + - CERTPROVIDER=zerossl + - EMAIL=shipkov.alexey@gmail.com + env_file: + - ../.env + volumes: + - /procharity_nginx/nginx_logs:/var/log/nginx + - ./swag_nginx.conf:/config/nginx/site-confs/default.conf + - keys:/config/keys + ports: + - "443:443" + - "80:80" + restart: unless-stopped + depends_on: + - backend + +volumes: + postgres_data: + keys: + + diff --git a/infra/swag_nginx.conf b/infra/swag_nginx.conf new file mode 100644 index 00000000..13e3c853 --- /dev/null +++ b/infra/swag_nginx.conf @@ -0,0 +1,29 @@ +server { + listen 80; + listen [::]:80; + server_name _; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name e2e5-185-119-1-24.ngrok-free.app; + + include /config/nginx/ssl.conf; + + root /var/www/; + + client_max_body_size 25M; + + server_tokens off; + + location /api/ { + proxy_pass http://backend:8000; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + } +} + From c8f6e242f9c3403b9d6a0bf3f08a1565898d59e1 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 20:08:19 +0300 Subject: [PATCH 02/25] add workflows webhook --- .github/workflows/deploy_stage.yaml | 4 ++-- infra/docker-compose.swag.yml | 4 ++-- infra/swag_nginx.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 1972290e..32efd403 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -71,7 +71,7 @@ jobs: host: ${{ secrets.HOST }} username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} - source: "infra/docker-compose.staging.yml,infra/nginx/nginx.local.conf" + source: "infra/docker-compose.swag.yml, infra/swag_nginx.conf" target: ${{ env.DEPLOY_PATH }} - name: Create .env file @@ -82,7 +82,7 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }} - mv infra/docker-compose.staging.yml infra/docker-compose.yaml + mv infra/docker-compose.swag.yml infra/docker-compose.yaml rm -f .env cat > .env <<- EOM POSTGRES_DB=${{ secrets.POSTGRES_DB }} diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index afc45915..53ae26ce 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -37,10 +37,10 @@ services: - NET_ADMIN environment: - TZ=Europe/Moscow - - URL=e2e5-185-119-1-24.ngrok-free.app + - URL=procharity.duckdns.com - VALIDATION=http - CERTPROVIDER=zerossl - - EMAIL=shipkov.alexey@gmail.com + - EMAIL=yandex-practicum@yandex.ru env_file: - ../.env volumes: diff --git a/infra/swag_nginx.conf b/infra/swag_nginx.conf index 13e3c853..98e0ab2d 100644 --- a/infra/swag_nginx.conf +++ b/infra/swag_nginx.conf @@ -9,7 +9,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name e2e5-185-119-1-24.ngrok-free.app; + server_name procharity.duckdns.com; include /config/nginx/ssl.conf; From af05da5fc91d7509928af3033f95fa831abccca4 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 20:22:14 +0300 Subject: [PATCH 03/25] add workflows2 --- infra/docker-compose.swag.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index 53ae26ce..d6353d72 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -19,7 +19,8 @@ services: image: postgres:13.2 container_name: procharity_postgres restart: always - user: postgres + ports: + - "9999:5432" volumes: - postgres_data:/var/lib/postgresql/data/ env_file: From 2184a5cdec3cb07ada00a7993a240f3ba8322181 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 20:40:42 +0300 Subject: [PATCH 04/25] add workflows3 --- .github/workflows/deploy_stage.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 32efd403..91a0aed3 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -110,6 +110,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | + netstat | grep 80 cd ${{ env.DEPLOY_PATH }}/infra docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest From 83f36bcaae0662b6257d2c187933cc2dcb40df62 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 20:55:10 +0300 Subject: [PATCH 05/25] add minor changes --- .github/workflows/deploy_stage.yaml | 2 +- infra/docker-compose.swag.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 91a0aed3..17b13a47 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -110,8 +110,8 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - netstat | grep 80 cd ${{ env.DEPLOY_PATH }}/infra + docker ps docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index d6353d72..0b9f5aa5 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -45,7 +45,7 @@ services: env_file: - ../.env volumes: - - /procharity_nginx/nginx_logs:/var/log/nginx + - /procharity2/full/nginx_logs:/var/log/nginx - ./swag_nginx.conf:/config/nginx/site-confs/default.conf - keys:/config/keys ports: From 2a95a2c134b31dff969a013eff258d0c5452aed9 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 21:05:32 +0300 Subject: [PATCH 06/25] add workflows4 --- .github/workflows/deploy_stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 17b13a47..be9ad01e 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -116,7 +116,7 @@ jobs: docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend - docker compose --file docker-compose.yaml up -d + docker compose --file docker-compose.yaml up -d --remove-orphans - name: Making migrations uses: appleboy/ssh-action@master with: From 408c412ed70a4ec5f4a4ab0c013ccf8ec17175c4 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 21:11:01 +0300 Subject: [PATCH 07/25] add webhook swag to workflow --- .github/workflows/deploy_stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index be9ad01e..17b13a47 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -116,7 +116,7 @@ jobs: docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend - docker compose --file docker-compose.yaml up -d --remove-orphans + docker compose --file docker-compose.yaml up -d - name: Making migrations uses: appleboy/ssh-action@master with: From 045938a62ea38879639aa3e1b2b49d9f3d6ad9fb Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 22:22:33 +0300 Subject: [PATCH 08/25] resolved problems webhook swag in workflow --- infra/docker-compose.swag.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index 0b9f5aa5..9850f377 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -20,13 +20,13 @@ services: container_name: procharity_postgres restart: always ports: - - "9999:5432" + - "5432:5432" volumes: - postgres_data:/var/lib/postgresql/data/ env_file: - ../.env healthcheck: - test: [ "CMD-SHELL", "pg_isready" ] + test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER}" ] interval: 10s timeout: 5s retries: 5 @@ -38,14 +38,14 @@ services: - NET_ADMIN environment: - TZ=Europe/Moscow - - URL=procharity.duckdns.com + - URL=${APPLICATION_URL} - VALIDATION=http - CERTPROVIDER=zerossl - EMAIL=yandex-practicum@yandex.ru env_file: - ../.env volumes: - - /procharity2/full/nginx_logs:/var/log/nginx + - ../nginx_logs:/var/log/nginx - ./swag_nginx.conf:/config/nginx/site-confs/default.conf - keys:/config/keys ports: From 98aed4c4d534009a6eea352a8dbc970c457f29da Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 22:44:58 +0300 Subject: [PATCH 09/25] fix deploy_stage --- .github/workflows/deploy_stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 17b13a47..a029a714 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -116,7 +116,7 @@ jobs: docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend - docker compose --file docker-compose.yaml up -d + docker compose --env-file ../.env --file docker-compose.yaml up -d - name: Making migrations uses: appleboy/ssh-action@master with: From 642f28139fcb1fea8e6c229873e056eb34991a33 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 22:56:36 +0300 Subject: [PATCH 10/25] fix deploy_stage2 --- .github/workflows/deploy_stage.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index a029a714..68254a62 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -111,12 +111,13 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra - docker ps + export APPLICATION_URL=${{ secrets.APPLICATION_URL }} + export POSTGRES_USER=${{ secrets.POSTGRES_USER }} docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend - docker compose --env-file ../.env --file docker-compose.yaml up -d + docker compose --file docker-compose.yaml up -d - name: Making migrations uses: appleboy/ssh-action@master with: From 1ffff101a2107176453e722f2f8735b01083a47e Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 23:05:27 +0300 Subject: [PATCH 11/25] fix deploy_stage3 --- .github/workflows/deploy_stage.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 68254a62..6f1f590a 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -125,6 +125,8 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | + export APPLICATION_URL=${{ secrets.APPLICATION_URL }} + export POSTGRES_USER=${{ secrets.POSTGRES_USER }} cd ${{ env.DEPLOY_PATH }}/infra docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds From 595ba23dcedc6b73f6bc264dc55be3c146691b84 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 23:24:20 +0300 Subject: [PATCH 12/25] fix deploy_stage4 --- .github/workflows/deploy_stage.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 6f1f590a..32efd403 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -111,8 +111,6 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra - export APPLICATION_URL=${{ secrets.APPLICATION_URL }} - export POSTGRES_USER=${{ secrets.POSTGRES_USER }} docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop @@ -125,8 +123,6 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - export APPLICATION_URL=${{ secrets.APPLICATION_URL }} - export POSTGRES_USER=${{ secrets.POSTGRES_USER }} cd ${{ env.DEPLOY_PATH }}/infra docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds From 416401a87d811c776a7eaa2da3babceb39501017 Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 23:29:31 +0300 Subject: [PATCH 13/25] fix deploy_stage5 --- .github/workflows/deploy_stage.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 32efd403..f298d7e9 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -111,6 +111,8 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra + export APPLICATION_URL=${{ env.APPLICATION_URL }} + export POSTGRES_USER=${{ env.POSTGRES_USER }} docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop @@ -123,6 +125,8 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | + export APPLICATION_URL=${{ env.APPLICATION_URL }} + export POSTGRES_USER=${{ env.POSTGRES_USER }} cd ${{ env.DEPLOY_PATH }}/infra docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds From 7529da6e8ab249f255f4f1e41b0fa503acb7c47f Mon Sep 17 00:00:00 2001 From: Anya S Date: Tue, 16 May 2023 23:33:53 +0300 Subject: [PATCH 14/25] fix deploy_stage5 --- .github/workflows/deploy_stage.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index f298d7e9..6f1f590a 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -111,8 +111,8 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra - export APPLICATION_URL=${{ env.APPLICATION_URL }} - export POSTGRES_USER=${{ env.POSTGRES_USER }} + export APPLICATION_URL=${{ secrets.APPLICATION_URL }} + export POSTGRES_USER=${{ secrets.POSTGRES_USER }} docker image prune -f docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop @@ -125,8 +125,8 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - export APPLICATION_URL=${{ env.APPLICATION_URL }} - export POSTGRES_USER=${{ env.POSTGRES_USER }} + export APPLICATION_URL=${{ secrets.APPLICATION_URL }} + export POSTGRES_USER=${{ secrets.POSTGRES_USER }} cd ${{ env.DEPLOY_PATH }}/infra docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds From d15a4ca75ff13d99741c76fb2f50b185114ae6f2 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 17:42:16 +0300 Subject: [PATCH 15/25] resolved issues --- .github/workflows/deploy_stage.yaml | 3 ++- infra/docker-compose.swag.yml | 4 +++- infra/swag_nginx.conf | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 6f1f590a..79c44b41 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -117,7 +117,8 @@ jobs: docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend - docker compose --file docker-compose.yaml up -d + docker container rm $(docker container ls -q) + docker compose --file docker-compose.yaml --env_file ../.env up -d - name: Making migrations uses: appleboy/ssh-action@master with: diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index 9850f377..aba282a1 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -42,11 +42,13 @@ services: - VALIDATION=http - CERTPROVIDER=zerossl - EMAIL=yandex-practicum@yandex.ru + - NGINX_ENVSUBST_OUTPUT_DIR: /config/nginx/site-confs/ + - APPLICATION_URL=${APPLICATION_URL} env_file: - ../.env volumes: - ../nginx_logs:/var/log/nginx - - ./swag_nginx.conf:/config/nginx/site-confs/default.conf + - ./swag_nginx.conf:/config/nginx/site-confs/default.conf.template - keys:/config/keys ports: - "443:443" diff --git a/infra/swag_nginx.conf b/infra/swag_nginx.conf index 98e0ab2d..07e68f12 100644 --- a/infra/swag_nginx.conf +++ b/infra/swag_nginx.conf @@ -9,7 +9,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name procharity.duckdns.com; + server_name $APPLICATION_URL; include /config/nginx/ssl.conf; From 4a7ea773a82650603ce0a56ebb81bbdb0b2164c8 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 17:50:15 +0300 Subject: [PATCH 16/25] resolved issues2 --- .github/workflows/deploy_stage.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 79c44b41..df4b0e6b 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -117,8 +117,9 @@ jobs: docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend + docker stop $(docker ps -aq) docker container rm $(docker container ls -q) - docker compose --file docker-compose.yaml --env_file ../.env up -d + docker compose --file docker-compose.yaml --env-file ../.env up -d - name: Making migrations uses: appleboy/ssh-action@master with: From 8c18c58cce0c2ea9965343e29902f4e5625ccd26 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 18:03:31 +0300 Subject: [PATCH 17/25] resolved issues3 --- .github/workflows/deploy_stage.yaml | 2 +- infra/docker-compose.swag.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index df4b0e6b..c6590a60 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -118,7 +118,7 @@ jobs: docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend docker stop $(docker ps -aq) - docker container rm $(docker container ls -q) + docker container rm $$(docker container ls -q) -f docker compose --file docker-compose.yaml --env-file ../.env up -d - name: Making migrations uses: appleboy/ssh-action@master diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index aba282a1..54268f68 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -42,7 +42,7 @@ services: - VALIDATION=http - CERTPROVIDER=zerossl - EMAIL=yandex-practicum@yandex.ru - - NGINX_ENVSUBST_OUTPUT_DIR: /config/nginx/site-confs/ + - NGINX_ENVSUBST_OUTPUT_DIR=/config/nginx/site-confs/ - APPLICATION_URL=${APPLICATION_URL} env_file: - ../.env From 97ab1b569b85fdcd1c5e58ea5e1225d5cd5da080 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 18:09:14 +0300 Subject: [PATCH 18/25] resolved issues4 --- .github/workflows/deploy_stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index c6590a60..32c8d1b7 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -118,7 +118,7 @@ jobs: docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend docker stop $(docker ps -aq) - docker container rm $$(docker container ls -q) -f + docker container ls -q | xargs --no-run-if-empty docker container rm -f docker compose --file docker-compose.yaml --env-file ../.env up -d - name: Making migrations uses: appleboy/ssh-action@master From e5d3fd379305b368d3ce69ec959012264539913b Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 20:29:12 +0300 Subject: [PATCH 19/25] resolved issues5 --- infra/swag_nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/swag_nginx.conf b/infra/swag_nginx.conf index 07e68f12..dc8df584 100644 --- a/infra/swag_nginx.conf +++ b/infra/swag_nginx.conf @@ -9,7 +9,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name $APPLICATION_URL; + server_name procharity.duckdns.org; include /config/nginx/ssl.conf; From 32c8c99f3896dd62c7b2b47afed99d9c022057a0 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 20:37:55 +0300 Subject: [PATCH 20/25] resolved issues6 --- .github/workflows/deploy_stage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 32c8d1b7..03339c30 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -118,8 +118,8 @@ jobs: docker compose --file docker-compose.yaml stop docker compose --file docker-compose.yaml rm backend docker stop $(docker ps -aq) - docker container ls -q | xargs --no-run-if-empty docker container rm -f - docker compose --file docker-compose.yaml --env-file ../.env up -d + docker container ls -q | xargs --no-run-if-empty docker container rm -f + docker compose --file docker-compose.yaml --env-file ../.env up -d --remove-orphans - name: Making migrations uses: appleboy/ssh-action@master with: From 4819ec0f6e0aa798b5eb6c17c824854ec42dfd07 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 20:43:31 +0300 Subject: [PATCH 21/25] resolved issues7 --- infra/docker-compose.swag.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/infra/docker-compose.swag.yml b/infra/docker-compose.swag.yml index 54268f68..9850f377 100644 --- a/infra/docker-compose.swag.yml +++ b/infra/docker-compose.swag.yml @@ -42,13 +42,11 @@ services: - VALIDATION=http - CERTPROVIDER=zerossl - EMAIL=yandex-practicum@yandex.ru - - NGINX_ENVSUBST_OUTPUT_DIR=/config/nginx/site-confs/ - - APPLICATION_URL=${APPLICATION_URL} env_file: - ../.env volumes: - ../nginx_logs:/var/log/nginx - - ./swag_nginx.conf:/config/nginx/site-confs/default.conf.template + - ./swag_nginx.conf:/config/nginx/site-confs/default.conf - keys:/config/keys ports: - "443:443" From d731e866004eaaa84cfec5c2775bfcf3cd5a1974 Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 22:23:38 +0300 Subject: [PATCH 22/25] resolved issues8 --- .github/workflows/deploy_stage.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 03339c30..30673124 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -21,6 +21,8 @@ env: IMAGE_NAME: procharity_back_2.0_backend DEPLOY_PATH: /procharity2/full WORK_DIR: /app + APPLICATION_URL: ${{ secrets.APPLICATION_URL }} + POSTGRES_USER: ${{ secrets.POSTGRES_USER }} defaults: run: @@ -111,15 +113,9 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra - export APPLICATION_URL=${{ secrets.APPLICATION_URL }} - export POSTGRES_USER=${{ secrets.POSTGRES_USER }} - docker image prune -f - docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest - docker compose --file docker-compose.yaml stop - docker compose --file docker-compose.yaml rm backend - docker stop $(docker ps -aq) - docker container ls -q | xargs --no-run-if-empty docker container rm -f - docker compose --file docker-compose.yaml --env-file ../.env up -d --remove-orphans + docker pull ${{ env.REGISTRY }}/${{ env.REP_OWNER }}/${{ env.IMAGE_NAME }}:latest + docker compose --file docker-compose.yaml --env-file ../.env up -d + docker system prune -a -f - name: Making migrations uses: appleboy/ssh-action@master with: @@ -127,8 +123,6 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - export APPLICATION_URL=${{ secrets.APPLICATION_URL }} - export POSTGRES_USER=${{ secrets.POSTGRES_USER }} cd ${{ env.DEPLOY_PATH }}/infra docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds From b372965065d1c8bafc8c16b480f19e4a3f59388f Mon Sep 17 00:00:00 2001 From: Anya S Date: Thu, 18 May 2023 22:32:05 +0300 Subject: [PATCH 23/25] resolved issues9 --- .github/workflows/deploy_stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 30673124..90c33397 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -124,7 +124,7 @@ jobs: password: ${{ secrets.SSH_PASSWORD }} script: | cd ${{ env.DEPLOY_PATH }}/infra - docker compose exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head + docker compose --env-file ../.env exec -T -w ${{ env.WORK_DIR }} backend alembic upgrade head - name: Sleep for 30 seconds run: sleep 30s shell: bash From 7519dbb6d699a440303daefcc4c164c0493734f2 Mon Sep 17 00:00:00 2001 From: Anya S Date: Fri, 19 May 2023 14:43:00 +0300 Subject: [PATCH 24/25] resolved issues10 --- .github/workflows/deploy_stage.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy_stage.yaml b/.github/workflows/deploy_stage.yaml index 90c33397..596d8077 100644 --- a/.github/workflows/deploy_stage.yaml +++ b/.github/workflows/deploy_stage.yaml @@ -21,8 +21,6 @@ env: IMAGE_NAME: procharity_back_2.0_backend DEPLOY_PATH: /procharity2/full WORK_DIR: /app - APPLICATION_URL: ${{ secrets.APPLICATION_URL }} - POSTGRES_USER: ${{ secrets.POSTGRES_USER }} defaults: run: From a6c75e32923d96aa164f65e2aed9179117b5de2f Mon Sep 17 00:00:00 2001 From: Anya S Date: Fri, 19 May 2023 16:56:26 +0300 Subject: [PATCH 25/25] resolved issues11 --- infra/swag_nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/swag_nginx.conf b/infra/swag_nginx.conf index dc8df584..65fc27f8 100644 --- a/infra/swag_nginx.conf +++ b/infra/swag_nginx.conf @@ -9,7 +9,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name procharity.duckdns.org; + server_name _; include /config/nginx/ssl.conf;