File tree Expand file tree Collapse file tree 2 files changed +11
-12
lines changed Expand file tree Collapse file tree 2 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 1
- ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2
- ARG RUNTIME=registry.redhat.io/ubi8/ubi-minimal @sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1
+ ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
2
+ ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest @sha256:0c1757c4526cfd7fdfedc54fadf4940e7f453201de65c0fefd454f3dde117273
3
3
4
4
FROM $GO_BUILDER AS builder
5
5
6
6
WORKDIR /go/src/github.com/openshift-pipelines/manual-approval-gate
7
7
COPY . .
8
8
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
9
9
ENV GODEBUG="http2server=0"
10
+ ENV GOEXPERIMENT=strictfipsruntime
10
11
RUN git rev-parse HEAD > /tmp/HEAD
11
12
RUN CGO_ENABLED=0 \
12
- go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat /tmp/HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/manual-approval-gate-controller \
13
+ go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat /tmp/HEAD)'" -mod=vendor -tags disable_gcp,strictfipsruntime -v -o /tmp/manual-approval-gate-controller \
13
14
./cmd/controller
14
15
15
16
FROM $RUNTIME
16
- ARG VERSION=manual-approval-gate-controller-main
17
+ ARG VERSION=manual-approval-gate-controller-1.17.2
17
18
18
19
ENV KO_APP=/ko-app \
19
20
KO_DATA_PATH=/kodata
@@ -33,7 +34,6 @@ LABEL \
33
34
io.openshift.tags="pipelines,tekton,openshift"
34
35
35
36
36
- RUN microdnf install -y shadow-utils
37
37
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
38
38
USER 65532
39
39
Original file line number Diff line number Diff line change 1
- ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2
- ARG RUNTIME=registry.redhat.io/ubi8/ubi-minimal @sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1
+ ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
2
+ ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest @sha256:0c1757c4526cfd7fdfedc54fadf4940e7f453201de65c0fefd454f3dde117273
3
3
4
4
FROM $GO_BUILDER AS builder
5
5
6
6
WORKDIR /go/src/github.com/openshift-pipelines/manual-approval-gate
7
7
COPY . .
8
8
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
9
9
ENV GODEBUG="http2server=0"
10
+ ENV GOEXPERIMENT=strictfipsruntime
10
11
RUN git rev-parse HEAD > /tmp/HEAD
11
12
RUN CGO_ENABLED=0 \
12
- go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat /tmp/HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/manual-approval-gate-webhook \
13
+ go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat /tmp/HEAD)'" -mod=vendor -tags disable_gcp,strictfipsruntime -v -o /tmp/manual-approval-gate-webhook \
13
14
./cmd/webhook
14
15
15
16
FROM $RUNTIME
16
- ARG VERSION=manual-approval-gate-webhook-main
17
+ ARG VERSION=manual-approval-gate-webhook-1.17.2
17
18
18
19
ENV KO_APP=/ko-app
19
20
@@ -31,9 +32,7 @@ LABEL \
31
32
io.openshift.tags="pipelines,tekton,openshift"
32
33
33
34
34
- RUN microdnf install -y shadow-utils && \
35
- groupadd -r -g 65532 nonroot && \
36
- useradd --no-log-init -r -u 65532 -g nonroot nonroot
35
+ RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
37
36
USER 65532
38
37
39
38
ENTRYPOINT ["/ko-app/manual-approval-gate-webhook" ]
You can’t perform that action at this time.
0 commit comments