Fix Architecture (#98)

Signed-off-by: galal-hussein <[email protected]>
rancher · Jun 25, 2024 · cf0af39 · cf0af39
1 parent b6db37a
commit cf0af39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/image-push.yml b/.github/workflows/image-push.yml
@@ -16,10 +16,11 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
-    - name: Set the TAG value
-      id: get-TAG
+    - name: Set the ENV values
+      id: get-Envs
       run: |
         echo "$(make -s log | grep TAG)" >> "$GITHUB_ENV"
+        echo "$(make -s log | grep ARCH)" >> "$GITHUB_ENV"
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -57,6 +58,7 @@ jobs:
         outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
         build-args: |
           TAG=${{ env.TAG }}
+          ARCH=${{ env.ARCH }}
 
     - name: Export digest
       run: |
@@ -81,10 +83,11 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
-    - name: Set the TAG value
-      id: get-TAG
+    - name: Set the ENV values
+      id: get-Envs
       run: |
         echo "$(make -s log | grep TAG)" >> "$GITHUB_ENV"
+        echo "$(make -s log | grep ARCH)" >> "$GITHUB_ENV"
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -122,6 +125,7 @@ jobs:
         outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
         build-args: |
           TAG=${{ env.TAG }}
+          ARCH=${{ env.ARCH }}
 
     - name: Export digest
       run: |

diff --git a/Dockerfile b/Dockerfile
@@ -226,4 +226,4 @@ COPY --from=calico_rootfs_overlay / /
 ENV PATH=$PATH:/opt/cni/bin
 RUN set -x && \
     test -e /opt/cni/bin/install && \
-    ln -vs /opt/cni/bin/install /install-cni \
+    ln -vs /opt/cni/bin/install /install-cni