Skip to content

Commit 5de8a0b

Browse files
committed
feat: Use ubi10 in base images
Note: This required an adjustment to the opa daemonset patch, otherwise compilation fails due to gcc-15 requirements. Along the road to fixing this, we found some relevant links which might be useful in future: - [Github Repo](https://github.com/daemontools/daemontools) (shows daemontools 0.76 is 12 years old) - [daemontools Homepage](https://cr.yp.to/daemontools.html) - [Debian bug report](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066623) - [Debian patches)(https://salsa.debian.org/debian/daemontools/-/tree/debian/latest/debian/patches?ref_type=heads) - [Reverted patch and GCC-15 fix](https://salsa.debian.org/debian/daemontools/-/commit/3e20831dfabe9dac4c5b6de3ae3945491280c80b#8756c63497c8dc39f7773438edf53b220c773f67)
1 parent 4c6276f commit 5de8a0b

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

druid/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ LABEL org.opencontainers.image.description="${DESCRIPTION}"
131131

132132
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
133133
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
134-
LABEL io.openshift.tags="ubi9,stackable,druid,sdp"
134+
LABEL io.openshift.tags="ubi10,stackable,druid,sdp"
135135
LABEL io.k8s.description="${DESCRIPTION}"
136136
LABEL io.k8s.display-name="${NAME}"
137137

hbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ LABEL org.opencontainers.image.description="${DESCRIPTION}"
9292

9393
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
9494
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
95-
LABEL io.openshift.tags="ubi9,stackable,hbase,sdp,nosql"
95+
LABEL io.openshift.tags="ubi10,stackable,hbase,sdp,nosql"
9696
LABEL io.k8s.description="${DESCRIPTION}"
9797
LABEL io.k8s.display-name="${NAME}"
9898

hive/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ LABEL org.opencontainers.image.description="${DESCRIPTION}"
178178

179179
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
180180
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
181-
LABEL io.openshift.tags="ubi9,stackable,hive,sdp"
181+
LABEL io.openshift.tags="ubi10,stackable,hive,sdp"
182182
LABEL io.k8s.description="${DESCRIPTION}"
183183
LABEL io.k8s.display-name="${NAME}"
184184

opa/daemontools/conf-cc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
+++ conf-cc 2014-07-14 12:07:14.837994394 +0000
33
@@ -1,3 +1,3 @@
44
-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
5-
+gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include /usr/include/errno.h
5+
+gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include /usr/include/errno.h -include /usr/include/unistd.h -std=gnu11 -Wno-incompatible-pointer-types -Wno-implicit-int -Wno-implicit-function-declaration
66

77
This will be used to compile .c files.

opensearch-dashboards/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ LABEL org.opencontainers.image.title="${NAME}"
218218
LABEL org.opencontainers.image.description="${DESCRIPTION}"
219219
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
220220
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
221-
LABEL io.openshift.tags="ubi9,stackable,opensearch-dashboards,opensearch"
221+
LABEL io.openshift.tags="ubi10,stackable,opensearch-dashboards,opensearch"
222222
LABEL io.k8s.description="${DESCRIPTION}"
223223
LABEL io.k8s.display-name="${NAME}"
224224

stackable-base/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ cd /secret-operator
3636
cargo auditable --quiet build --release --package cert-tools && cargo cyclonedx --all --spec-version 1.5 --describe binaries
3737
EOF
3838

39-
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
39+
# Find the latest version at https://catalog.redhat.com/en/software/containers/ubi10/ubi-minimal/66f1504a379b9c2cf23e145c#get-the-image
4040
# IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
4141
# rather than just the "Image Digest" that references the image for the selected architecture.
42-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:2f06ae0e6d3d9c4f610d32c480338eef474867f435d8d28625f2985e8acde6e8 AS final
42+
FROM registry.access.redhat.com/ubi10/ubi-minimal@sha256:28ec2f4662bdc4b0d4893ef0d8aebf36a5165dfb1d1dc9f46319bd8a03ed3365 AS final
4343

4444
# intentionally unused
4545
ARG PRODUCT_VERSION
@@ -156,7 +156,7 @@ chown ${STACKABLE_USER_UID}:0 /stackable/.curlrc
156156
# CVE-2023-37920: Remove "e-Tugra" root certificates
157157
# e-Tugra's root certificates were subject to an investigation prompted by reporting of security issues in their systems
158158
# Until they are removed by default from ca-certificates, we should remove them manually
159-
EXPECTED_CERTS_PACKAGE="ca-certificates-2025.2.80_v9.0.305-91.el9.noarch"
159+
EXPECTED_CERTS_PACKAGE="ca-certificates-2025.2.80_v9.0.305-102.el10_1.noarch"
160160
ACTUAL_CERTS_PACKAGE="$(rpm -qa ca-certificates)"
161161
if [ "$ACTUAL_CERTS_PACKAGE" != "$EXPECTED_CERTS_PACKAGE" ]; then
162162
echo "The ca-certificates package was updated to $ACTUAL_CERTS_PACKAGE. Please check if the e-Tugra root certificates are present. \

stackable-devel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
# Use `stackable-base` as a base for the final image stage instead
99
#
1010

11-
# Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
11+
# Find the latest version at https://catalog.redhat.com/en/software/containers/ubi10/ubi-minimal/66f1504a379b9c2cf23e145c#get-the-image
1212
# IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
1313
# rather than just the "Image Digest" that references the image for the selected architecture.
14-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:2f06ae0e6d3d9c4f610d32c480338eef474867f435d8d28625f2985e8acde6e8
14+
FROM registry.access.redhat.com/ubi10/ubi-minimal@sha256:28ec2f4662bdc4b0d4893ef0d8aebf36a5165dfb1d1dc9f46319bd8a03ed3365
1515

1616
# intentionally unused
1717
ARG PRODUCT_VERSION

testing-tools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Stackable testing tools image
22

3-
* Based on debian/python 3.12 unlike `tools` which is based on UBI9 with python 3.9.
3+
* Based on debian/python 3.12 unlike `tools` which is based on UBI10 with python 3.9.
44
* Comes with Python packages needed by the kuttl tests.

0 commit comments

Comments
 (0)