Skip to content

Commit 6a3e171

Browse files
committed
Update to UBI 9 and build binaries for FIPS
Signed-off-by: mprahl <[email protected]>
1 parent 67fa96f commit 6a3e171

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

backend/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Build arguments
1616
ARG SOURCE_CODE=.
1717

18-
FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder
18+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
1919

2020
USER root
2121
# Downloading Argo CLI so that the samples are validated
@@ -37,10 +37,10 @@ RUN GO111MODULE=on go mod download
3737
# Copy the source
3838
COPY ${SOURCE_CODE}/ ./
3939

40-
RUN GO111MODULE=on go build -o /bin/apiserver ./backend/src/apiserver/ && \
40+
RUN GO111MODULE=on CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -o /bin/apiserver ./backend/src/apiserver/ && \
4141
dnf clean all
4242

43-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
43+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
4444

4545
WORKDIR /bin
4646

backend/Dockerfile.driver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN GO111MODULE=on go mod download
3434
# Copy the source
3535
COPY ${SOURCE_CODE}/ ./
3636

37-
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/driver ./backend/src/v2/cmd/driver/*.go
37+
RUN GO111MODULE=on CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GOEXPERIMENT=strictfipsruntime go build -tags 'netgo strictfipsruntime' -o /bin/driver ./backend/src/v2/cmd/driver/*.go
3838

3939
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
4040

backend/Dockerfile.persistenceagent

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
ARG SOURCE_CODE=.
1717
ARG CI_CONTAINER_VERSION="unknown"
1818

19-
20-
# Use ubi8/go-toolset as base image
21-
FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder
19+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
2220

2321
## Build args to be used at this step
2422
ARG SOURCE_CODE
@@ -37,9 +35,9 @@ RUN GO111MODULE=on go mod download
3735
# Copy the source
3836
COPY ${SOURCE_CODE}/ ./
3937

40-
RUN GO111MODULE=on go build -o /bin/persistence_agent backend/src/agent/persistence/*.go
38+
RUN GO111MODULE=on CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -o /bin/persistence_agent backend/src/agent/persistence/*.go
4139

42-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
40+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
4341
WORKDIR /bin
4442

4543
COPY --from=builder /bin/persistence_agent /bin/persistence_agent

backend/Dockerfile.scheduledworkflow

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
# Build arguments
1616
ARG SOURCE_CODE=.
1717

18-
# Use ubi8/nodejs-14 as base image
19-
FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder
18+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
2019

2120
## Build args to be used at this step
2221
ARG SOURCE_CODE
@@ -42,9 +41,9 @@ RUN GO111MODULE=on go mod download
4241
# Copy the source
4342
COPY ${SOURCE_CODE}/ ./
4443

45-
RUN GO111MODULE=on go build -o /bin/controller backend/src/crd/controller/scheduledworkflow/*.go
44+
RUN GO111MODULE=on CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -o /bin/controller backend/src/crd/controller/scheduledworkflow/*.go
4645

47-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
46+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
4847
WORKDIR /bin
4948

5049
COPY --from=builder /bin/controller /bin/controller

tools/commit_checker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
1+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
22

33
WORKDIR /tmp
44
RUN git clone https://github.com/openshift/build-machinery-go.git && \
55
cd /tmp/build-machinery-go/commitchecker && \
66
go build
77

8-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
8+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
99

1010
WORKDIR /bin
1111

0 commit comments

Comments
 (0)