fix(actions): simplify env calls & add port to scp

PaulYakow · Feb 9, 2024 · 15971ee · 15971ee
1 parent 569b934
commit 15971ee
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -45,19 +45,19 @@ jobs:
 
       - name: Copy compose file
         run: |
-          scp -i deploy_key -o StrictHostKeyChecking=no ${{ github.workspace }}/docker-compose.yaml ${{ env.HOST }}:${{ env.DEPLOY_DIRECTORY }}/docker-compose.yaml
+          scp -i deploy_key -p $SSH_PORT -o StrictHostKeyChecking=no ${{ github.workspace }}/docker-compose.yaml $HOST:$DEPLOY_DIRECTORY/docker-compose.yaml
 
       - name: Create .env file into deploy directory
         run: |
           ssh -i deploy_key -p $SSH_PORT -o StrictHostKeyChecking=no $HOST "\
-          echo IMAGE_ID=$IMAGE_ID > ${{ env.ENV_FILE_PATH }} && \
-          echo TG_TOKEN=${{ secrets.TG_TOKEN }} >> ${{ env.ENV_FILE_PATH }} && \
-          echo WEBHOOK_URL=${{ secrets.WEBHOOK_URL }} >> ${{ env.ENV_FILE_PATH }} && \
-          echo WEBHOOK_PORT=${{ secrets.WEBHOOK_PORT }} >> ${{ env.ENV_FILE_PATH }} && \
-          chmod 600 ${{ env.ENV_FILE_PATH }}"
+          echo IMAGE_ID=$IMAGE_ID > $ENV_FILE_PATH && \
+          echo TG_TOKEN=${{ secrets.TG_TOKEN }} >> $ENV_FILE_PATH && \
+          echo WEBHOOK_URL=${{ secrets.WEBHOOK_URL }} >> $ENV_FILE_PATH && \
+          echo WEBHOOK_PORT=${{ secrets.WEBHOOK_PORT }} >> $ENV_FILE_PATH && \
+          chmod 600 $ENV_FILE_PATH"
 
       - name: Restart container
         run: |
           ssh -i deploy_key -p $SSH_PORT -o StrictHostKeyChecking=no $HOST "\
-          cd ${{ env.DEPLOY_DIRECTORY }} && \
+          cd $DEPLOY_DIRECTORY && \
           docker compose up -d"