File tree Expand file tree Collapse file tree 7 files changed +19
-7
lines changed Expand file tree Collapse file tree 7 files changed +19
-7
lines changed Original file line number Diff line number Diff line change @@ -8,8 +8,9 @@ COPY upstream .
8
8
COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
+ ENV GOEXPERIMENT=strictfipsruntime
11
12
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/controller \
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime - v -o /tmp/controller \
13
14
./cmd/controller
14
15
15
16
FROM $RUNTIME
Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
11
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/events \
12
+ ENV GOEXPERIMENT=strictfipsruntime
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/events \
13
14
./cmd/events
14
15
15
16
FROM $RUNTIME
Original file line number Diff line number Diff line change 1
1
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
2
+ ARG MID_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2
3
ARG RUNTIME=scratch
3
4
4
5
FROM $GO_BUILDER AS builder
@@ -9,12 +10,17 @@ COPY .konflux/patches patches/
9
10
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
11
COPY head HEAD
11
12
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/nop \
13
+ ENV GOEXPERIMENT=strictfipsruntime
14
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/nop \
13
15
./cmd/nop
14
16
17
+ FROM $MID_RUNTIME AS tmp
18
+
15
19
FROM $RUNTIME
16
20
ARG VERSION=pipeline-1.18
17
21
22
+ COPY --from=tmp /usr/lib64/libcrypto.so.* /usr/lib64/
23
+
18
24
ENV NOP=/usr/local/bin/nop \
19
25
KO_APP=/ko-app \
20
26
KO_DATA_PATH=/kodata
Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
11
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/resolvers \
12
+ ENV GOEXPERIMENT=strictfipsruntime
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/resolvers \
13
14
./cmd/resolvers
14
15
15
16
FROM $RUNTIME
Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
11
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/sidecarlogresults \
12
+ ENV GOEXPERIMENT=strictfipsruntime
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/sidecarlogresults \
13
14
./cmd/sidecarlogresults
14
15
15
16
FROM $RUNTIME
Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
11
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/webhook \
12
+ ENV GOEXPERIMENT=strictfipsruntime
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/webhook \
13
14
./cmd/webhook
14
15
15
16
FROM $RUNTIME
Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ COPY .konflux/patches patches/
9
9
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
10
10
COPY head HEAD
11
11
ENV GODEBUG="http2server=0"
12
- RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/workingdirinit \
12
+ ENV GOEXPERIMENT=strictfipsruntime
13
+ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/workingdirinit \
13
14
./cmd/workingdirinit
14
15
15
16
FROM $RUNTIME
You can’t perform that action at this time.
0 commit comments