Skip to content

Commit a05c372

Browse files
committed
ci: fix base image string argument
1 parent 6300602 commit a05c372

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/build-and-push.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
# Read the base-image label from the source image for the current platform
106106
# ubuntu:noble as the fallback
107107
BASE=$(docker buildx imagetools inspect \
108-
--raw \
109108
"hpretl/iic-osic-tools:${{ needs.prepare.outputs.source_tag }}" \
110109
--format '{{ (index .Image.Config.Labels "org.opencontainers.image.base.name") }}' \
111110
2>/dev/null || true)

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
# as they are not shared libraries and ldd cannot see them.
2828

2929
ARG SOURCE_IMAGE=hpretl/iic-osic-tools:2025.12
30+
ARG BASE_IMAGE=ubuntu:noble
3031
FROM ${SOURCE_IMAGE} AS source
3132

3233
# Derive the needed apt-managed packages
@@ -59,10 +60,9 @@ RUN find \
5960
# choose to install is pinned to exactly the version from this image.
6061
RUN pip3 freeze > /tmp/pip-constraints.txt
6162

62-
# Base image: defaults to ubuntu:noble but can be overridden at build time.
63+
# Base image: overridden at build time via --build-arg BASE_IMAGE=...
6364
# In CI the base is read from the org.opencontainers.image.base.name label
6465
# of the source image so this image always tracks the same base as iic-osic-tools.
65-
ARG BASE_IMAGE=ubuntu:noble
6666
FROM ${BASE_IMAGE}
6767

6868
ENV DEBIAN_FRONTEND=noninteractive \

0 commit comments

Comments
 (0)