Skip to content

Commit 78c9bef

Browse files
authored
chore: Update Dockerfiles to use Go toolset 1.26.3 and native Go FIPS 140 configuration in Konflux Dockerfiles (#700)
1 parent 34b9132 commit 78c9bef

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

argo-argoexec/Dockerfile.konflux

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG GIT_COMMIT=unknown
55
ARG GIT_TAG=unknown
66
ARG GIT_TREE_STATE=unknown
77

8-
FROM registry.access.redhat.com/ubi9/go-toolset:1.26@sha256:b2c0898987b688a95f4d2f38abdfd929f45903948831783153019ab749495c72 as builder
8+
FROM registry.access.redhat.com/ubi9/go-toolset:1.26.3@sha256:d36470d5258da00f618b7aca9bdaab8e05134aa938bd6c42d9bd17d50ed45e76 as builder
99

1010
# Build args to be used at this step
1111
ARG SOURCE_CODE
@@ -21,8 +21,7 @@ COPY ${SOURCE_CODE}/ ./
2121
# Set the /workspace directory as safe for Git
2222
RUN git config --global --add safe.directory /workspace
2323

24-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE} CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -v -o dist/argoexec-fips ./cmd/argoexec
25-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE} CGO_ENABLED=0 go build -ldflags '-extldflags -static' -v -o dist/argoexec ./cmd/argoexec
24+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE} CGO_ENABLED=0 GOTOOLCHAIN=local GOFIPS140=v1.0.0 go build -tags no_openssl -ldflags '-extldflags -static' -v -o dist/argoexec ./cmd/argoexec
2625

2726
####################################################################################################
2827
FROM registry.redhat.io/ubi9/ubi-minimal@sha256:8d905a93f1392d4a8f7fb906bd49bf540290674b28d82de3536bb4d0898bf9d7 AS workflow-controller
@@ -43,12 +42,11 @@ LABEL com.redhat.component="odh-data-science-pipelines-argo-argoexec-container"
4342
WORKDIR /bin
4443

4544
COPY --from=builder /workspace/dist/argoexec /bin/
46-
COPY --from=builder /workspace/dist/argoexec-fips /bin/
4745
COPY --from=builder /etc/mime.types /etc/mime.types
4846
COPY --from=builder /workspace/hack/ssh_known_hosts /etc/ssh/
4947
COPY --from=builder /workspace/hack/nsswitch.conf /etc/
5048

51-
RUN chmod +x /bin/argoexec && chmod +x /bin/argoexec-fips
49+
RUN chmod +x /bin/argoexec
5250

5351
USER 2000
5452

argo-workflowcontroller/Dockerfile.konflux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG GIT_COMMIT=unknown
66
ARG GIT_TAG=unknown
77
ARG GIT_TREE_STATE=unknown
88

9-
FROM registry.access.redhat.com/ubi9/go-toolset:1.26@sha256:b2c0898987b688a95f4d2f38abdfd929f45903948831783153019ab749495c72 as builder
9+
FROM registry.access.redhat.com/ubi9/go-toolset:1.26.3@sha256:d36470d5258da00f618b7aca9bdaab8e05134aa938bd6c42d9bd17d50ed45e76 as builder
1010

1111
# Build args to be used at this step
1212
ARG SOURCE_CODE
@@ -22,7 +22,7 @@ COPY ${SOURCE_CODE}/ ./
2222
# Set the /workspace directory as safe for Git
2323
RUN git config --global --add safe.directory /workspace
2424

25-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE} CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -v -o dist/workflow-controller ./cmd/workflow-controller
25+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE} GOTOOLCHAIN=local CGO_ENABLED=0 GOFIPS140=v1.0.0 go build -tags no_openssl -v -o dist/workflow-controller ./cmd/workflow-controller
2626

2727
####################################################################################################
2828
FROM registry.redhat.io/ubi9/ubi-minimal@sha256:8d905a93f1392d4a8f7fb906bd49bf540290674b28d82de3536bb4d0898bf9d7 AS workflow-controller

0 commit comments

Comments
 (0)