Try explicit dependency on docker-build

.gitlab-ci.yml

@@ -57,6 +57,7 @@ docker-tests:
 docker-publish:
   stage: deploy
   dependencies:
+    - docker-build
     - docker-tests
   variables:
     FULL_VERSION: $FULL_VERSION

build.sh

@@ -14,17 +14,22 @@ if [[ -n $LAST_VERSION && $LAST_VERSION != $FULL_VERSION ]]; then
   export CI_USE_CACHE=false
 fi
 params=()
-if [[ $CI_USE_CACHE == true ]]; then
-  params+=(--cache-from "$CI_IMAGE_TAG")
-else
-  params+=(--no-cache)
-  echo "CI_USE_CACHE is false"
-fi
 export params
 
 # https://gitlab.com/gitlab-org/gitlab-foss/-/issues/17861#note_19140733
 if [[ $CI_USE_CACHE == true ]]; then
-  docker pull "$CI_IMAGE_TAG" || true
+  if docker pull "$CI_IMAGE_TAG"; then
+    echo "Using existing image $CI_IMAGE_TAG as cache source"
+    params+=(--cache-from "$CI_IMAGE_TAG")
+  elif docker pull "$CI_REGISTRY_IMAGE:master"; then
+    echo "Falling back to $CI_REGISTRY_IMAGE:master as cache source"
+    params+=(--cache-from "$CI_REGISTRY_IMAGE:master")
+  else
+    echo "No available cache source found, building fresh"
+    params+=(--no-cache)
+else
+  echo "CI_USE_CACHE is false"
+  params+=(--no-cache)
 fi
 
 docker build "${params[@]}" -t "${CI_IMAGE_TAG}" .