From d6fa7cd106f00e5e6bed7ef9eb473d9478dd6b2e Mon Sep 17 00:00:00 2001 From: Jakub Scholz Date: Wed, 8 May 2024 13:00:18 +0200 Subject: [PATCH] Use UBI9 instead of UBI8 as a base image Signed-off-by: Jakub Scholz --- CHANGELOG.md | 1 + docker-images/base/Dockerfile | 4 ++-- docker-images/kafka-based/kafka/Dockerfile | 2 +- docker-images/maven-builder/Dockerfile | 4 ++-- .../io/strimzi/systemtest/security/SystemTestCertManager.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af9d544a325..d0084554779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * The `UseKRaft` feature gate moves to GA stage and is permanently enabled without the possibility to disable it. To use KRaft (ZooKeeper-less Apache Kafka), you still need to use the `strimzi.io/kraft: enabled` annotation on the `Kafka` custom resources or migrate from an existing ZooKeeper-based cluster using the `strimzi.io/kraft: migration` annotation. +* Update the base image used by Strimzi containers from UBI8 to UBI9 * Enhance `KafkaBridge` resource with consumer inactivity timeout and HTTP consumer/producer enablement. ## 0.41.0 diff --git a/docker-images/base/Dockerfile b/docker-images/base/Dockerfile index b1ae2015209..f3f8f362917 100644 --- a/docker-images/base/Dockerfile +++ b/docker-images/base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest +FROM registry.access.redhat.com/ubi9/ubi-minimal:latest LABEL org.opencontainers.image.source='https://github.com/strimzi/strimzi-kafka-operator' @@ -9,7 +9,7 @@ ARG TARGETARCH USER root RUN microdnf update \ - && microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install java-${JAVA_VERSION}-openjdk-headless openssl shadow-utils \ + && microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y java-${JAVA_VERSION}-openjdk-headless openssl shadow-utils \ && microdnf reinstall -y tzdata \ && microdnf clean all diff --git a/docker-images/kafka-based/kafka/Dockerfile b/docker-images/kafka-based/kafka/Dockerfile index abd40372ea3..b3a053b8024 100644 --- a/docker-images/kafka-based/kafka/Dockerfile +++ b/docker-images/kafka-based/kafka/Dockerfile @@ -9,7 +9,7 @@ ARG strimzi_version ARG TARGETOS ARG TARGETARCH -RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install gettext nmap-ncat net-tools unzip hostname findutils tar \ +RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y gettext nmap-ncat net-tools unzip hostname findutils tar \ && microdnf clean all # Add kafka user with UID 1001 diff --git a/docker-images/maven-builder/Dockerfile b/docker-images/maven-builder/Dockerfile index 95937a3e0e4..d3e3afe2b3d 100644 --- a/docker-images/maven-builder/Dockerfile +++ b/docker-images/maven-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/openjdk-17:1.19 +FROM registry.access.redhat.com/ubi9/openjdk-17:1.18 LABEL org.opencontainers.image.source='https://github.com/strimzi/strimzi-kafka-operator' @@ -8,7 +8,7 @@ USER root # The user is in the group 0 to have access to the mounted volumes and storage RUN useradd -r -m -u 1001 -g 0 strimzi -RUN microdnf update \ +RUN microdnf update -y \ && microdnf clean all USER 1001 diff --git a/systemtest/src/main/java/io/strimzi/systemtest/security/SystemTestCertManager.java b/systemtest/src/main/java/io/strimzi/systemtest/security/SystemTestCertManager.java index f66b4b358fd..f43bb33aaaf 100644 --- a/systemtest/src/main/java/io/strimzi/systemtest/security/SystemTestCertManager.java +++ b/systemtest/src/main/java/io/strimzi/systemtest/security/SystemTestCertManager.java @@ -78,7 +78,7 @@ public static List getCertificateChain(String certificateName) { "s:O = io.strimzi, CN = " + certificateName + "\n" + " i:O = io.strimzi, CN = cluster-ca", "Server certificate\n" + - "subject=O = io.strimzi, CN = " + certificateName + "\n\n" + + "subject=O = io.strimzi, CN = " + certificateName + "\n" + "issuer=O = io.strimzi, CN = cluster-ca" )); }