Skip to content

Commit b18af31

Browse files
committed
FIPS cahnges with ubi9 upgrade
1 parent 217eba1 commit b18af31

File tree

4 files changed

+4
-884
lines changed

4 files changed

+4
-884
lines changed

Dockerfile.konflux

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
1-
# Build arguments
2-
ARG SOURCE_CODE=.
3-
4-
# BEGIN -- workaround lack of go-toolset for golang 1.23
5-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23@sha256:0a070e4a8f2698b6aba3630a49eb995ff1b0a182d0c5fa264888acf9d535f384 AS golang
6-
7-
FROM registry.access.redhat.com/ubi8/ubi@sha256:3e6410626323e6f11af16b28b8e73faa4799fe0dbdb4b1cfbf6f029c34b038f3 AS builder
8-
ARG GOLANG_VERSION=1.23.0
9-
10-
# Install system dependencies
11-
RUN dnf upgrade -y && dnf install -y \
12-
gcc \
13-
make \
14-
openssl-devel \
15-
git \
16-
&& dnf clean all && rm -rf /var/cache/yum
17-
18-
# Install Go
19-
ENV PATH=/usr/local/go/bin:$PATH
20-
21-
COPY --from=golang /usr/lib/golang /usr/local/go
22-
# End of Go versioning workaround
1+
FROM registry.access.redhat.com/ubi9/go-toolset:1.23@sha256:8a634d63713a073d7a1e086a322e57b148eef9620834fc8266df63d9294dff1b AS builder
232

243
WORKDIR /workspace
254

@@ -42,9 +21,9 @@ RUN git config --global --add safe.directory /workspace
4221
# Build
4322
USER root
4423

45-
RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o manager main.go
24+
RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -a -o manager main.go
4625

47-
FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:b2a1bec3dfbc7a14a1d84d98934dfe8fdde6eb822a211286601cf109cbccb075
26+
FROM registry.redhat.io/ubi9/ubi-minimal@sha256:e1c4703364c5cb58f5462575dc90345bcd934ddc45e6c32f9c162f2b5617681c
4827
WORKDIR /
4928
COPY --from=builder /workspace/manager .
5029

@@ -59,4 +38,4 @@ LABEL com.redhat.component="odh-codeflare-operator-container" \
5938
io.openshift.expose-services="" \
6039
io.k8s.display-name="odh-codeflare-operator-container" \
6140
io.k8s.description="odh-codeflare-operator" \
62-
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
41+
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"

rpms.in.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)