fix: CI for k3d arm64 image

deislabs · Sep 16, 2023 · 2457b54 · 2457b54
1 parent 4e03b0b
commit 2457b54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -61,10 +61,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Build and push k3d shim image
-      - name: untar x86_64 musl artifacts into ./deployments/k3d/.tmp dir
+      - name: untar musl artifacts into ./deployments/k3d/.tmp/linux/(amd64|arm64) dir
         run: |
-          mkdir -p ./deployments/k3d/.tmp
-          for f in ./_artifacts/*/*-x86_64.tar.gz; do tar -xf $f --directory ./deployments/k3d/.tmp; done
+          mkdir -p ./deployments/k3d/.tmp/linux/amd64
+          mkdir -p ./deployments/k3d/.tmp/linux/arm64
+          for f in ./_artifacts/*/*-x86_64.tar.gz; do tar -xf $f --directory ./deployments/k3d/.tmp/linux/amd64; done
+          for f in ./_artifacts/*/*-aarch64.tar.gz; do tar -xf $f --directory ./deployments/k3d/.tmp/linux/arm64; done
       - name: build and push k3d shim image
         uses: docker/build-push-action@v3
         with:

diff --git a/deployments/k3d/Dockerfile b/deployments/k3d/Dockerfile
@@ -1,7 +1,8 @@
 FROM rancher/k3s:v1.24.6-k3s1
 
 # copy shims from target directory into the /bin
-COPY ./.tmp /bin/
+ARG TARGETPLATFORM
+COPY ./.tmp/${TARGETPLATFORM} /bin/
 
 # copy in an containerd config into /etc/containerd/config.toml
 COPY config.toml.tmpl /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl