From c20dd0985cfc4e2c4930532727bbee4956797e87 Mon Sep 17 00:00:00 2001 From: John Wang Date: Fri, 19 May 2023 11:07:37 +0800 Subject: [PATCH] fix: cache not use --- .github/workflows/build-api-image.sh | 4 ++-- .github/workflows/build-web-image.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-api-image.sh b/.github/workflows/build-api-image.sh index 528336f71a..03af321dd9 100644 --- a/.github/workflows/build-api-image.sh +++ b/.github/workflows/build-api-image.sh @@ -27,8 +27,8 @@ if [[ "${REFSPEC}" == "main" ]]; then fi echo "Pulling cache image ${API_REPO_NAME}:${CACHE_FROM_TAG}" -if docker pull "${API_REPO_NAME}:${CACHE_FROM_TAG}"; then - API_CACHE_FROM_SCRIPT="--cache-from ${API_REPO_NAME}:${CACHE_FROM_TAG}" +if docker buildx imagetools create cache-image --name=${API_REPO_NAME}:${CACHE_FROM_TAG} -platform=linux/amd64,linux/arm64; then + API_CACHE_FROM_SCRIPT="--cache-from cache-image" else echo "WARNING: Failed to pull ${API_REPO_NAME}:${CACHE_FROM_TAG}, disable build image cache." API_CACHE_FROM_SCRIPT="" diff --git a/.github/workflows/build-web-image.sh b/.github/workflows/build-web-image.sh index bb702cf27c..b87933b8bd 100644 --- a/.github/workflows/build-web-image.sh +++ b/.github/workflows/build-web-image.sh @@ -27,8 +27,8 @@ if [[ "${REFSPEC}" == "main" ]]; then fi echo "Pulling cache image ${WEB_REPO_NAME}:${CACHE_FROM_TAG}" -if docker pull "${WEB_REPO_NAME}:${CACHE_FROM_TAG}"; then - WEB_CACHE_FROM_SCRIPT="--cache-from ${WEB_REPO_NAME}:${CACHE_FROM_TAG}" +if docker buildx imagetools create cache-image --name=${WEB_REPO_NAME}:${CACHE_FROM_TAG} -platform=linux/amd64,linux/arm64; then + WEB_CACHE_FROM_SCRIPT="--cache-from cache-image" else echo "WARNING: Failed to pull ${WEB_REPO_NAME}:${CACHE_FROM_TAG}, disable build image cache." WEB_CACHE_FROM_SCRIPT=""