fix prod workflow

Studio-Yandex-Practicum · Sep 5, 2023 · b49d9f2 · b49d9f2
1 parent bc76435
commit b49d9f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/deploy-bot-on-prod.yml b/.github/workflows/deploy-bot-on-prod.yml
@@ -13,13 +13,19 @@ jobs:
       name: prod_deploy
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - name: copy service file
+      - uses: actions/checkout@v2
+      - name: Prepare infra/prod
+        run: |
+          mkdir ../build
+          cp -TR ./infra/prod ../build
+          tar -cvf deploy.tar ../build/
+      - name: copy infra/prod
         uses: appleboy/scp-action@v0.1.4
         with:
           host: ${{ secrets.VM_HOST }}
           username: ${{ secrets.VM_USER }}
           password: ${{ secrets.VM_PASSWORD }}
-          source: "infra/prod/"
+          source: "deploy.tar"
           target: /home/deploy/spread_wings_bot/infra/prod/
       - name: ssh pull and start
         uses: appleboy/ssh-action@master
@@ -29,6 +35,8 @@ jobs:
           password: ${{ secrets.VM_PASSWORD }}
           script: |
             cd /home/deploy/spread_wings_bot/infra/prod/
+            tar -xvf deploy.tar --strip-components 1
+            rm deploy.tar
             rm .env
             touch .env
 
@@ -69,16 +77,14 @@ jobs:
             docker system prune --force
 
             # Installing defend service for app
-            # Шаг с копированием в строках 16-23 можно заменить командой ниже - нужно тестировать
-            # scp infra/prod/spread_wings_bot.service ${{ secrets.VM_USER }}@${{ secrets.VM_HOST }}:/spread_wings_bot/infra/prod/
-            sudo cp -f /home/deploy/spread_wings_bot/infra/prod/spread_wings_bot.service /etc/systemd/system/spread_wings_bot.service
+            sudo cp -f /home/deploy/spread_wings_bot/infra/prod/spread_wings_bot_prod.service /etc/systemd/system/spread_wings_bot_prod.service
             sudo systemctl daemon-reload
-            sudo systemctl restart spread_wings_bot.service
+            sudo systemctl restart spread_wings_bot_prod.service
 
             # Installing the app
-            docker-compose -f docker-compose.stage.yaml stop
-            docker-compose -f docker-compose.stage.yaml pull
-            docker-compose -f docker-compose.stage.yaml up -d
+            docker-compose -f docker-compose.prod.yaml stop
+            docker-compose -f docker-compose.prod.yaml pull
+            docker-compose -f docker-compose.prod.yaml up -d
 
             # Applying initialization commands
             docker exec spread-wings-bot python manage.py migrate

diff --git a/.github/workflows/deploy-bot-on-stage.yml b/.github/workflows/deploy-bot-on-stage.yml
@@ -77,8 +77,6 @@ jobs:
             docker system prune --force
 
             # Installing defend service for app
-            # Шаг с копированием в строках 16-23 можно заменить командой ниже - нужно тестировать
-            # scp infra/dev/spread_wings_bot.service ${{ secrets.VM_USER }}@${{ secrets.VM_HOST }}:/spread_wings_bot/infra/dev/
             sudo cp -f /home/deploy/spread_wings_bot/infra/dev/spread_wings_bot.service /etc/systemd/system/spread_wings_bot.service
             sudo systemctl daemon-reload
             sudo systemctl restart spread_wings_bot.service

diff --git a/infra/prod/spread_wings_bot.service → infra/prod/spread_wings_bot_prod.service b/infra/prod/spread_wings_bot.service → infra/prod/spread_wings_bot_prod.service