Skip to content
Open
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
30 changes: 17 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.12 AS builder
FROM golang:1.26 AS builder

ARG CACHE_DEPS="true"
WORKDIR /opt/app-root/src
Expand All @@ -17,20 +17,26 @@ COPY ./must-gather ./must-gather
USER 0
RUN make build

FROM registry.access.redhat.com/ubi9/ubi-minimal
FROM registry.access.redhat.com/ubi9/ubi:latest AS packages

RUN INSTALL_PKGS=" \
openssl \
# Install ubi-micro runtime packages into a staging root directory using DNF
RUN mkdir -p /mnt/rootfs && \
dnf install -y --installroot /mnt/rootfs \
--releasever 9 \
--setopt=install_weak_deps=false \
--nodocs \
openssl-libs \
ca-certificates \
rsync \
file \
xz \
" && \
microdnf install -y ${INSTALL_PKGS} && \
rpm -V ${INSTALL_PKGS} && \
microdnf clean all && \
mkdir /tmp/ocp-clo && \
chmod og+w /tmp/ocp-clo
xz && \
dnf --installroot /mnt/rootfs clean all && \
mkdir -p /mnt/rootfs/tmp/ocp-clo && \
chmod og+w /mnt/rootfs/tmp/ocp-clo

FROM registry.access.redhat.com/ubi9/ubi-micro

COPY --from=packages /mnt/rootfs/ /
COPY --from=builder /opt/app-root/src/bin/cluster-logging-operator /usr/bin/
COPY --from=builder /opt/app-root/src/bin/must-gather /usr/bin/

Expand All @@ -50,5 +56,3 @@ LABEL \
name="openshift-logging/cluster-logging-rhel9-operator" \
com.redhat.component="cluster-logging-operator-container" \
io.openshift.maintainer.product="OpenShift Container Platform" \


27 changes: 16 additions & 11 deletions Dockerfile.art
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry-proxy.engineering.redhat.com/rh-osbs/openshift-golang-builder:v1.25.12.20260813.141452 AS builder
FROM registry.redhat.io/openshift/golang-builder:golang-builder-v1.26-rhel9 AS builder

ENV GOEXPERIMENT=strictfipsruntime
ENV CGO_ENABLED=1
Expand All @@ -8,19 +8,24 @@ WORKDIR /opt/app-root/src

RUN make build BUILD_OPTS="-tags strictfipsruntime"

FROM registry.redhat.io/ubi9/ubi-minimal:9.7

RUN INSTALL_PKGS=" \
# Install ubi-micro runtime packages into a staging root directory using DNF
RUN mkdir -p /mnt/rootfs && \
dnf install -y --installroot /mnt/rootfs \
--releasever 9 \
--setopt=install_weak_deps=false \
--nodocs \
openssl-libs \
ca-certificates \
rsync \
file \
xz \
" && \
microdnf install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
microdnf clean all && \
mkdir /tmp/ocp-clo && \
chmod og+w /tmp/ocp-clo
xz && \
dnf --installroot /mnt/rootfs clean all && \
mkdir -p /mnt/rootfs/tmp/ocp-clo && \
chmod og+w /mnt/rootfs/tmp/ocp-clo

FROM registry.redhat.io/ubi9/ubi-micro:9.7

COPY --from=builder /mnt/rootfs/ /
COPY --from=builder /opt/app-root/src/bin/cluster-logging-operator /usr/bin/
COPY --from=builder /opt/app-root/src/bin/must-gather /usr/bin/

Expand Down
Loading