fix arhc for docker agent

kubeshop · Oct 14, 2024 · e6e7492 · e6e7492
1 parent 9b92457
commit e6e7492
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -138,12 +138,14 @@ jobs:
 
       - name: Preload kind images
         run: |
-          mkdir -p build/kind/images
+          mkdir -p build/kind/images/arm
+          mkdir -p build/kind/images/amd
+
           docker pull --platform linux/arm64 kindest/node:v1.31.0
-          docker save kindest/node:v1.31.0 > build/kind/images/node.tar
+          docker save kindest/node:v1.31.0 > build/kind/images/arm/node.tar
 
           docker pull --platform linux/amd64 kindest/node:v1.31.0
-          docker save kindest/node:v1.31.0 >> build/kind/images/node.tar
+          docker save kindest/node:v1.31.0 > build/kind/images/amd/node.tar
 
       - name: Build and push
         uses: docker/build-push-action@v6

diff --git a/build/kind/entrypoint.sh b/build/kind/entrypoint.sh
@@ -189,10 +189,24 @@ while ! docker info; do
   sleep 5
 done
 
+# Set image folder based on architecture
+case "$arch" in
+  x86_64)
+    IMAGE_FOLDER="/images/amd"
+    ;;
+  arm64)
+    IMAGE_FOLDER="/images/arm"
+    ;;
+  *)
+    log "Unsupported architecture: $arch"
+    exit 1
+    ;;
+esac
+
 # Step 3: Import pre-installed images
-for file in /images/*.tar; do
+for file in "$IMAGE_FOLDER"/*.tar; do
   log "Load docker image $file..."
-  docker load <$file
+  docker load < "$file"
 done
 
 # Get the list of kind clusters