diff --git a/Dockerfile.ubi b/Dockerfile.ubi index f9ccd75b2..435973004 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -3,7 +3,7 @@ ARG BASE_IMAGE FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} AS SRC -FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi:latest} AS ubi +FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi9/ubi:latest} AS ubi ARG TARGETARCH @@ -20,8 +20,7 @@ RUN mkdir /image && \ COPY ubi-build-files-${TARGETARCH}.txt /tmp # Copy all the required files from the base UBI image into the image directory # As the go binary is not statically compiled this includes everything needed for CGO to work, cacerts, tzdata and RH release files -RUN tar cf /tmp/files.tar -T /tmp/ubi-build-files-${TARGETARCH}.txt && tar xf /tmp/files.tar -C /image/ \ - && strip --strip-unneeded /image/usr/lib64/*[0-9].so +RUN tar cf /tmp/files.tar -T /tmp/ubi-build-files-${TARGETARCH}.txt && tar xf /tmp/files.tar -C /image/ # Generate a rpm database which contains all the packages that you said were needed in ubi-build-files-*.txt RUN rpm --root /image --initdb \ diff --git a/ubi-build-files-amd64.txt b/ubi-build-files-amd64.txt index 19ed69cf9..be576ffce 100644 --- a/ubi-build-files-amd64.txt +++ b/ubi-build-files-amd64.txt @@ -3,13 +3,8 @@ root/buildinfo etc/ssl/certs etc/redhat-release usr/share/zoneinfo -usr/lib64/ld-2.28.so usr/lib64/ld-linux-x86-64.so.2 -usr/lib64/libc-2.28.so usr/lib64/libc.so.6 -usr/lib64/libdl-2.28.so usr/lib64/libdl.so.2 -usr/lib64/libpthread-2.28.so usr/lib64/libpthread.so.0 -usr/lib64/libm-2.28.so -usr/lib64/libm.so.6 +usr/lib64/libm.so.6 \ No newline at end of file diff --git a/ubi-build-files-arm64.txt b/ubi-build-files-arm64.txt index 32491847f..1647f78ba 100644 --- a/ubi-build-files-arm64.txt +++ b/ubi-build-files-arm64.txt @@ -3,13 +3,8 @@ root/buildinfo etc/ssl/certs etc/redhat-release usr/share/zoneinfo -usr/lib64/ld-2.28.so -usr/lib64/ld-linux-aarch64.so.1 -usr/lib64/libc-2.28.so +usr/lib/ld-linux-aarch64.so.1 usr/lib64/libc.so.6 -usr/lib64/libdl-2.28.so usr/lib64/libdl.so.2 -usr/lib64/libpthread-2.28.so usr/lib64/libpthread.so.0 -usr/lib64/libm-2.28.so -usr/lib64/libm.so.6 +usr/lib64/libm.so.6 \ No newline at end of file