Skip to content

optionally prefer Dockerfile.alma8 and Dockerfile.alma9 #36037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnej27959 merged 1 commit into from
Feb 26, 2026
+11 −2
Merged

optionally prefer Dockerfile.alma8 and Dockerfile.alma9 #36037

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .buildkite/build-container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ cp -a "${LOCAL_RPM_REPO}/." "${WORKDIR}/docker-image/rpms/"
cd "${WORKDIR}/docker-image"
SOURCE_GITREF=$(git rev-parse HEAD)

select_dockerfile() {
wanted="Dockefile.${VESPA_BUILDOS_LABEL}"
if [ -f "${wanted}" ]; then
echo "${wanted}"
else
echo "Dockerfile"
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}"
Expand All @@ -57,7 +66,7 @@ docker build --progress plain \
--build-arg VESPA_BASE_IMAGE="$VESPA_BASE_IMAGE" \
--tag vespaengine/vespa \
--tag "${GHCR_PREVIEW_TAG}" \
--file Dockerfile .
--file "$(select_dockerfile)" .

declare -r GITREF="${GITREF_SYSTEM_TEST:-HEAD}"

Expand Down Expand Up @@ -90,4 +99,4 @@ docker build --progress=plain \
--build-arg VESPA_BASE_IMAGE="${GHCR_PREVIEW_TAG}" \
--target systemtest \
--tag "$DOCKER_SYSTEMTEST_TAG" \
--file Dockerfile .
--file "$(select_dockerfile)" .