Skip to content

Commit e87f3cf

Browse files
committed
Update to UBI 9 and include FIPS binaries for launcher
Signed-off-by: mprahl <[email protected]>
1 parent 6cd6f81 commit e87f3cf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

backend/Dockerfile.driver

Lines changed: 2 additions & 3 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

2221
## Build args to be used at this step
@@ -37,7 +36,7 @@ COPY ${SOURCE_CODE}/ ./
3736

3837
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
3938

40-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
39+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
4140

4241
WORKDIR /bin
4342

backend/Dockerfile.launcher

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ ARG SOURCE_CODE=.
1717
ARG CI_CONTAINER_VERSION="unknown"
1818

1919

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

2322

2423
## Build args to be used at this step
@@ -38,13 +37,15 @@ RUN GO111MODULE=on go mod download
3837
COPY ${SOURCE_CODE}/ ./
3938

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

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

4444
WORKDIR /bin
4545

4646
COPY --from=builder /bin/launcher-v2 /bin/launcher-v2
47-
RUN chmod +x /bin/launcher-v2
47+
COPY --from=builder /bin/launcher-v2-fips /bin/launcher-v2-fips
48+
RUN chmod +x /bin/launcher-v2 && chmod +x /bin/launcher-v2-fips
4849

4950
ENTRYPOINT ["/bin/launcher-v2"]
5051

0 commit comments

Comments
 (0)