chore(build): pull before cache (#19)

PrestaShop · Oct 31, 2023 · 771f003 · 771f003
1 parent 280d0a7
commit 771f003
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -124,14 +124,16 @@ fi
 
 # Build the docker image
 # ----------------------
+CACHE_IMAGE=${TARGET_IMAGES[1]}
+docker pull "$CACHE_IMAGE" 2> /dev/null || true
 docker buildx build \
   --file "./docker/${OS_FLAVOUR}.Dockerfile" \
   --platform "${PLATFORM:-linux/amd64}" \
-  --cache-from "${TARGET_IMAGES[1]}" \
-  --build-arg PHP_FLAVOUR="${PHP_FLAVOUR}" \
-  --build-arg PS_VERSION="${PS_VERSION}" \
-  --build-arg PHP_VERSION="${PHP_VERSION}" \
-  --build-arg GIT_SHA="${GIT_SHA}" \
+  --cache-from "$CACHE_IMAGE" \
+  --build-arg PHP_FLAVOUR="$PHP_FLAVOUR" \
+  --build-arg PS_VERSION="$PS_VERSION" \
+  --build-arg PHP_VERSION="$PHP_VERSION" \
+  --build-arg GIT_SHA="$GIT_SHA" \
   --label org.opencontainers.image.title="PrestaShop Flashlight" \
   --label org.opencontainers.image.description="PrestaShop Flashlight testing utility" \
   --label org.opencontainers.image.source=https://github.com/PrestaShop/prestashop-flashlight \