ci/cd - fix push workflows

.github/workflows/beta.yml

@@ -280,7 +280,7 @@ jobs:
 
   # Push Docker images
   push-bunkerweb:
-    needs: [wait-builds]
+    needs: [create-arm, wait-builds]
     uses: ./.github/workflows/push-docker.yml
     with:
       IMAGE: bunkerity/bunkerweb:beta,bunkerity/bunkerweb:${{ needs.wait-builds.outputs.version }}
@@ -290,9 +290,10 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
       ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+      ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
       ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
   push-scheduler:
-    needs: [wait-builds]
+    needs: [create-arm, wait-builds]
     uses: ./.github/workflows/push-docker.yml
     with:
       IMAGE: bunkerity/bunkerweb-scheduler:beta,bunkerity/bunkerweb-scheduler:${{ needs.wait-builds.outputs.version }}
@@ -302,9 +303,10 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
       ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+      ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
       ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
   push-autoconf:
-    needs: [wait-builds]
+    needs: [create-arm, wait-builds]
     uses: ./.github/workflows/push-docker.yml
     with:
       IMAGE: bunkerity/bunkerweb-autoconf:beta,bunkerity/bunkerweb-autoconf:${{ needs.wait-builds.outputs.version }}
@@ -314,9 +316,10 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
       ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+      ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
       ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
   push-ui:
-    needs: [wait-builds]
+    needs: [create-arm, wait-builds]
     uses: ./.github/workflows/push-docker.yml
     with:
       IMAGE: bunkerity/bunkerweb-ui:beta,bunkerity/bunkerweb-ui:${{ needs.wait-builds.outputs.version }}
@@ -326,6 +329,7 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
       ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+      ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
       ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
 
   # Push Linux packages
@@ -335,6 +339,7 @@ jobs:
     with:
       SEPARATOR: _
       SUFFIX: amd64
+      SUFFIX2: -1_amd64
       REPO: bunkerweb
       LINUX: ubuntu
       VERSION: jammy
@@ -348,6 +353,7 @@ jobs:
     with:
       SEPARATOR: _
       SUFFIX: amd64
+      SUFFIX2: -1_amd64
       REPO: bunkerweb
       LINUX: debian
       VERSION: bullseye
@@ -361,6 +367,7 @@ jobs:
     with:
       SEPARATOR: "-"
       SUFFIX: 1.x86_64
+      SUFFIX2: -1.x86_64
       REPO: bunkerweb
       LINUX: el
       VERSION: 8
@@ -374,6 +381,7 @@ jobs:
     with:
       SEPARATOR: "-"
       SUFFIX: 1.x86_64
+      SUFFIX2: -1.x86_64
       REPO: bunkerweb
       LINUX: fedora
       VERSION: 37

.github/workflows/push-docker.yml

@@ -21,6 +21,8 @@ on:
         required: true
       ARM_SSH_CONFIG:
         required: true
+      ARM_SSH_IP:
+        require: true
 
 jobs:
   push:
@@ -45,9 +47,10 @@ jobs:
           mkdir -p ~/.ssh
           echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
           chmod 600 ~/.ssh/id_rsa_arm
-          echo "$SSH_CONFIG" > ~/.ssh/config
+          echo "$SSH_CONFIG" | sed "s/SSH_IP/$SSH_IP/g" > ~/.ssh/config
         env:
           SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_IP: ${{ secrets.ARM_SSH_IP }}
           SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
       - name: Append ARM node to buildx
         run: |

.github/workflows/push-packagecloud.yml

@@ -9,6 +9,9 @@ on:
       SUFFIX:
         required: true
         type: string
+      SUFFIX2:
+        required: true
+        type: string
       REPO:
         required: true
         type: string
@@ -56,7 +59,7 @@ jobs:
       - name: Push package to packagecloud
         uses: danielmundi/upload-packagecloud@v1
         with:
-          PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/bunkerweb${{ inputs.SEPARATOR }}${{ inputs.BW_VERSION }}${{ inputs.SEPARATOR }}${{ inputs.SUFFIX }}.${{ inputs.PACKAGE }}
+          PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/bunkerweb${{ inputs.SEPARATOR }}${{ inputs.BW_VERSION }}${{ inputs.SUFFIX2 }}.${{ inputs.PACKAGE }}
           PACKAGECLOUD-USERNAME: bunkerity
           PACKAGECLOUD-REPO: ${{ inputs.REPO }}
           PACKAGECLOUD-DISTRIB: ${{ inputs.LINUX }}/${{ inputs.VERSION }}