Skip to content

CARRY: migrate base images to RHEL 9.8 #32

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
EmilienM merged 2 commits into from
Sep 2, 2026
Merged

CARRY: migrate base images to RHEL 9.8 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295a3fb
CARRY: Migrate Konflux base images to RHEL 9.8
EmilienM Sep 1, 2026
0ccd5fd
fix(konflux): build gateway package
EmilienM Sep 2, 2026
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
4 changes: 2 additions & 2 deletions deploy/docker/Dockerfile.konflux.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG RUST_VERSION=1.92.0
# ---------------------------------------------------------------------------
# Build stage: compile CLI (fully-static glibc binary)
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi:9.6@sha256:dec374e05cc13ebbc0975c9f521f3db6942d27f8ccdf06b180160490eef8bdbc AS builder
FROM registry.access.redhat.com/ubi9/ubi:9.8@sha256:25a147defd01e19674714f55d17538c8dbe55d8c305fa157ecc3f9c8977b05b6 AS builder

ARG RUST_VERSION
ARG TARGETARCH
Expand Down Expand Up @@ -73,7 +73,7 @@ RUN . /tmp/build-env && \
# ---------------------------------------------------------------------------
# Runtime
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6@sha256:34880b64c07f28f64d95737f82f891516de9a3b43583f39970f7bf8e4cfa48b7
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8@sha256:7fbeae18dc9476399f565e68255f602a3374ea8614ba3d14843565131a13ff93

RUN microdnf install -y --nodocs ca-certificates \
&& microdnf clean all
Expand Down
6 changes: 3 additions & 3 deletions deploy/docker/Dockerfile.konflux.gateway
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# ---------------------------------------------------------------------------
# Build
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi:9.6@sha256:dec374e05cc13ebbc0975c9f521f3db6942d27f8ccdf06b180160490eef8bdbc AS builder
FROM registry.access.redhat.com/ubi9/ubi:9.8@sha256:25a147defd01e19674714f55d17538c8dbe55d8c305fa157ecc3f9c8977b05b6 AS builder

RUN dnf install -y --nodocs --setopt=install_weak_deps=0 \
rust cargo \
Expand Down Expand Up @@ -48,13 +48,13 @@ RUN mkdir -p /tmp/z3-src \
&& if [ -n "$VER" ]; then export OPENSHELL_GIT_VERSION="$VER"; fi \
&& Z3_SYS_BUNDLED_DIR_OVERRIDE=/tmp/z3-src \
cargo build --release \
--package openshell-server \
--package openshell-gateway \
--features bundled-z3

# ---------------------------------------------------------------------------
# Runtime
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6@sha256:34880b64c07f28f64d95737f82f891516de9a3b43583f39970f7bf8e4cfa48b7
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8@sha256:7fbeae18dc9476399f565e68255f602a3374ea8614ba3d14843565131a13ff93

RUN microdnf install -y --nodocs --setopt=install_weak_deps=0 ca-certificates \
&& microdnf clean all
Expand Down
4 changes: 2 additions & 2 deletions deploy/docker/Dockerfile.konflux.supervisor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG RUST_VERSION=1.92.0
# ---------------------------------------------------------------------------
# Build stage: compile supervisor (fully-static glibc binary)
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi:9.6@sha256:dec374e05cc13ebbc0975c9f521f3db6942d27f8ccdf06b180160490eef8bdbc AS builder
FROM registry.access.redhat.com/ubi9/ubi:9.8@sha256:25a147defd01e19674714f55d17538c8dbe55d8c305fa157ecc3f9c8977b05b6 AS builder

ARG RUST_VERSION
ARG TARGETARCH
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN . /tmp/build-env && \
# ---------------------------------------------------------------------------
# Runtime
# ---------------------------------------------------------------------------
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6@sha256:34880b64c07f28f64d95737f82f891516de9a3b43583f39970f7bf8e4cfa48b7
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8@sha256:7fbeae18dc9476399f565e68255f602a3374ea8614ba3d14843565131a13ff93

ARG TARGETARCH

Expand Down
2 changes: 1 addition & 1 deletion deploy/konflux/cli/rpms.in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Build + runtime stages combined.
#
# Resolved with `context.bare: true` so the lockfile pins the full dependency
# closure. The image installs RPMs into two different bases (the ubi:9.6 build
# closure. The image installs RPMs into two different bases (the ubi:9.8 build
# stage and the ubi-minimal runtime stage); bare guarantees every package is
# pinned and prefetched regardless of which base already provides it.
#
Expand Down
2 changes: 1 addition & 1 deletion deploy/konflux/gateway/rpms.in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Build + runtime stages combined.
#
# Resolved with `context.bare: true` so the lockfile pins the full dependency
# closure. The image installs RPMs into two different bases (the ubi:9.6 build
# closure. The image installs RPMs into two different bases (the ubi:9.8 build
# stage and the ubi-minimal runtime stage); bare guarantees every package is
# pinned and prefetched regardless of which base already provides it.
#
Expand Down
2 changes: 1 addition & 1 deletion deploy/konflux/supervisor/rpms.in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Build + runtime stages combined.
#
# Resolved with `context.bare: true` so the lockfile pins the full dependency
# closure. The image installs RPMs into two different bases (the ubi:9.6 build
# closure. The image installs RPMs into two different bases (the ubi:9.8 build
# stage and the ubi-minimal runtime stage); bare guarantees every package is
# pinned and prefetched regardless of which base already provides it.
#
Expand Down
Loading