Skip to content
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.

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

Use UBI9 instead of UBI8 as a base image #10126

Merged
merged 1 commit into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-images/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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 \
scholzj marked this conversation as resolved.
Show resolved Hide resolved
&& 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

Expand Down
2 changes: 1 addition & 1 deletion docker-images/kafka-based/kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-images/maven-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static List<String> 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"
));
}
Expand Down
Loading