Skip to content

Commit 74e1526

Browse files
committed
Update dockerfile
Signed-off-by: savitaashture <[email protected]>
1 parent bf13a14 commit 74e1526

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.konflux/dockerfiles/controller.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
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
33

44
FROM $GO_BUILDER AS builder
55

66
WORKDIR /go/src/github.com/openshift-pipelines/manual-approval-gate
77
COPY . .
88
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
99
ENV GODEBUG="http2server=0"
10+
ENV GOEXPERIMENT=strictfipsruntime
1011
RUN git rev-parse HEAD > /tmp/HEAD
1112
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 \
1314
./cmd/controller
1415

1516
FROM $RUNTIME
16-
ARG VERSION=manual-approval-gate-controller-main
17+
ARG VERSION=manual-approval-gate-controller-1.17.2
1718

1819
ENV KO_APP=/ko-app \
1920
KO_DATA_PATH=/kodata
@@ -33,7 +34,6 @@ LABEL \
3334
io.openshift.tags="pipelines,tekton,openshift"
3435

3536

36-
RUN microdnf install -y shadow-utils
3737
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3838
USER 65532
3939

.konflux/dockerfiles/webhook.Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
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
33

44
FROM $GO_BUILDER AS builder
55

66
WORKDIR /go/src/github.com/openshift-pipelines/manual-approval-gate
77
COPY . .
88
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
99
ENV GODEBUG="http2server=0"
10+
ENV GOEXPERIMENT=strictfipsruntime
1011
RUN git rev-parse HEAD > /tmp/HEAD
1112
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 \
1314
./cmd/webhook
1415

1516
FROM $RUNTIME
16-
ARG VERSION=manual-approval-gate-webhook-main
17+
ARG VERSION=manual-approval-gate-webhook-1.17.2
1718

1819
ENV KO_APP=/ko-app
1920

@@ -31,9 +32,7 @@ LABEL \
3132
io.openshift.tags="pipelines,tekton,openshift"
3233

3334

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
3736
USER 65532
3837

3938
ENTRYPOINT ["/ko-app/manual-approval-gate-webhook"]

0 commit comments

Comments
 (0)