Merge pull request #37177 from vespa-engine/arnej/use-prebuilt-base-image

Reuse prebuilt base image in build-container.sh when available

Author: arnej27959

.buildkite/build-container.sh

@@ -57,6 +57,13 @@ select_dockerfile() {
     fi
 }
 
+target_option=""
+if [ "${PREBUILT_BASE_IMAGE:-}" != "" ]; then
+    VESPA_BASE_IMAGE="${PREBUILT_BASE_IMAGE}:${VESPA_BUILDOS_LABEL}"
+    SYSTEM_TEST_BASE_IMAGE=${VESPA_BASE_IMAGE}
+    target_option="--target vespa"
+fi
+
 echo "--- Building Vespa preview container"
 GHCR_PREVIEW_TAG=ghcr.io/vespa-engine/vespa-preview-${ARCH}:${VESPA_VERSION}${VESPA_CONTAINER_IMAGE_VERSION_TAG_SUFFIX}
 echo "Building container with tag: ${GHCR_PREVIEW_TAG}"
@@ -66,6 +73,7 @@ docker build --progress plain \
              --build-arg VESPA_BASE_IMAGE="$VESPA_BASE_IMAGE" \
              --tag vespaengine/vespa \
              --tag "${GHCR_PREVIEW_TAG}" \
+             ${target_option} \
              --file "$(select_dockerfile)" .
 
 declare -r GITREF="${GITREF_SYSTEM_TEST:-HEAD}"