From e6e74921b169f0c49e0e5edbf9529d253f9e4b4c Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Mon, 14 Oct 2024 13:57:21 +0300 Subject: [PATCH] fix arhc for docker agent --- .github/workflows/release.yaml | 8 +++++--- build/kind/entrypoint.sh | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b59e50e038..7c3ff5bb20 100644 --- 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 index c1b6f3b2b8..20003e1741 100644 --- 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