From 47d537a89dd47181f3e9fb659842c387d8ae36b3 Mon Sep 17 00:00:00 2001 From: Robert Gogolok Date: Fri, 30 Jan 2026 01:26:51 +0100 Subject: [PATCH] base-images: Support podman Signed-off-by: Robert Gogolok --- base-images/build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/base-images/build.sh b/base-images/build.sh index d561f236..83360913 100755 --- a/base-images/build.sh +++ b/base-images/build.sh @@ -62,14 +62,16 @@ RUN_IMAGE=${REPO_PREFIX}-run:${TAG} BUILD_IMAGE=${REPO_PREFIX}-build:${TAG} FROM_IMAGE=$(head -n1 "${IMAGE_DIR}"/base/Dockerfile | cut -d' ' -f2) +CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker} + # Get target distro information -DISTRO_NAME=$(docker run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^ID=' | cut -d'=' -f2) +DISTRO_NAME=$(${CONTAINER_RUNTIME} run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^ID=' | cut -d'=' -f2) echo "DISTRO_NAME: ${DISTRO_NAME}" -DISTRO_VERSION=$(docker run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^VERSION_ID=' | cut -d'=' -f2) +DISTRO_VERSION=$(${CONTAINER_RUNTIME} run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^VERSION_ID=' | cut -d'=' -f2) echo "DISTRO_VERSION: ${DISTRO_VERSION}" if [[ -d "${IMAGE_DIR}/base" ]]; then - docker build --platform=${PLATFORM} \ + ${CONTAINER_RUNTIME} build --platform=${PLATFORM} \ --build-arg "distro_name=${DISTRO_NAME}" \ --build-arg "distro_version=${DISTRO_VERSION}" \ --build-arg "stack_id=${STACK_ID}" \ @@ -78,14 +80,14 @@ if [[ -d "${IMAGE_DIR}/base" ]]; then fi echo "BUILDING ${BUILD_IMAGE}..." -docker build --platform=${PLATFORM} \ +${CONTAINER_RUNTIME} build --platform=${PLATFORM} \ --build-arg "base_image=${BASE_IMAGE}" \ --build-arg "stack_id=${STACK_ID}" \ -t "${BUILD_IMAGE}" \ "${IMAGE_DIR}/build" echo "BUILDING ${RUN_IMAGE}..." -docker build --platform=${PLATFORM} \ +${CONTAINER_RUNTIME} build --platform=${PLATFORM} \ --build-arg "base_image=${BASE_IMAGE}" \ -t "${RUN_IMAGE}" \ "${IMAGE_DIR}/run" @@ -96,4 +98,4 @@ echo echo "Images:" for IMAGE in "${BASE_IMAGE}" "${BUILD_IMAGE}" "${RUN_IMAGE}"; do echo " ${IMAGE}" -done \ No newline at end of file +done