Retrieve SSH port from environment secrets (#337)

Fixes current deployment failure due to use of non-standard SSH port on our production host. `ssh-keyscan` command was moved out to its own step to help troubleshooting in the future. Signed-off-by: Octol1ttle <[email protected]>
TeamOctolings · Oct 28, 2024 · 8a42ecd · 8a42ecd
1 parent 84dc248
commit 8a42ecd
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -39,40 +39,49 @@ jobs:
     needs: upload-image
 
     steps:
-      - name: Setup SSH key
+      - name: Copy SSH key
         run: |
           install -m 600 -D /dev/null ~/.ssh/id_ed25519
           echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519
-          ssh-keyscan -H $SSH_HOST > ~/.ssh/known_hosts
-        shell: bash {0}
+        shell: bash
         env:
           SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
+
+      - name: Generate SSH known hosts file
+        run: |
+          ssh-keyscan -H $SSH_HOST -p $SSH_PORT > ~/.ssh/known_hosts
+        shell: bash
+        env:
           SSH_HOST: ${{secrets.SSH_HOST}}
-
+          SSH_PORT: ${{secrets.SSH_PORT}}
+
       - name: Stop currently running instance
         run: |
-          ssh $SSH_USER@$SSH_HOST $STOP_COMMAND
-        shell: bash {0}
+          ssh -p $SSH_PORT $SSH_USER@$SSH_HOST $STOP_COMMAND
+        shell: bash
         env:
+          SSH_PORT: ${{secrets.SSH_PORT}}
           SSH_USER: ${{secrets.SSH_USER}}
           SSH_HOST: ${{secrets.SSH_HOST}}
           STOP_COMMAND: ${{vars.STOP_COMMAND}}
 
       - name: Update Docker image
         run: |
-          ssh $SSH_USER@$SSH_HOST docker pull ghcr.io/$NAMESPACE/$IMAGE_NAME:latest
-        shell: bash {0}
+          ssh -p $SSH_PORT $SSH_USER@$SSH_HOST docker pull ghcr.io/$NAMESPACE/$IMAGE_NAME:latest
+        shell: bash
         env:
+          SSH_PORT: ${{secrets.SSH_PORT}}
           SSH_USER: ${{secrets.SSH_USER}}
           SSH_HOST: ${{secrets.SSH_HOST}}
           NAMESPACE: ${{vars.NAMESPACE}}
           IMAGE_NAME: ${{vars.IMAGE_NAME}}
 
       - name: Start new instance
         run: |
-          ssh $SSH_USER@$SSH_HOST $START_COMMAND
-        shell: bash {0}
+          ssh -p $SSH_PORT $SSH_USER@$SSH_HOST $START_COMMAND
+        shell: bash
         env:
+          SSH_PORT: ${{secrets.SSH_PORT}}
           SSH_USER: ${{secrets.SSH_USER}}
           SSH_HOST: ${{secrets.SSH_HOST}}
           START_COMMAND: ${{vars.START_COMMAND}}