Skip to content

Commit 8d23a20

Browse files
openshift-pipelines-botpramodbindal
authored andcommitted
Updated controller.Dockerfile to use correct entrypoint command
1 parent 498c6d1 commit 8d23a20

File tree

2 files changed

+17
-42
lines changed

2 files changed

+17
-42
lines changed
Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
11
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
2-
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal@sha256:daa61d6103e98bccf40d7a69a0d4f8786ec390e2204fd94f7cc49053e9949360
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
33

44
FROM $GO_BUILDER AS builder
55

66
WORKDIR /go/src/github.com/openshift-pipelines/tektoncd-pruner
77
COPY . .
88

9-
RUN go build -v -o /tmp/controller ./cmd/controller
9+
ENV GODEBUG="http2server=0"
10+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/controller \
11+
./cmd/controller
1012

1113
FROM $RUNTIME
12-
ARG VERSION=tektoncd-pruner
14+
ARG VERSION=tektoncd-pruner-1-18
1315

14-
COPY --from=builder /tmp/controller /ko-app/controller
16+
ENV KO_APP=/ko-app \
17+
CONTROLLER=${KO_APP}/controller
1518

19+
COPY --from=builder /tmp/controller ${CONTROLLER}
1620

1721
LABEL \
18-
com.redhat.component="openshift-pipelines-tektoncd-pruner-controller" \
19-
name="openshift-pipelines/pipelines-tektoncd-pruner-rhel9" \
22+
com.redhat.component="openshift-pipelines-tektoncd-pruner-controller-rhel9-container" \
23+
name="openshift-pipelines/pipelines-tektoncd-pruner-controller-rhel9" \
2024
version=$VERSION \
21-
summary="Red Hat OpenShift Pipelines Tekton Pruner - Controller" \
25+
summary="Red Hat OpenShift Pipelines tektoncd-pruner Controller" \
2226
maintainer="[email protected]" \
23-
description="Red Hat OpenShift Pipelines Tekton Pruner - Controller" \
24-
io.k8s.display-name="Red Hat OpenShift Pipelines Tekton Pruner - Controller" \
25-
io.k8s.description="Red Hat OpenShift Pipelines Tekton Pruner - Controller" \
26-
io.openshift.tags="pipelines,tekton,openshift,tektoncd-pruner-controller"
27+
description="Red Hat OpenShift Pipelines tektoncd-pruner Controller" \
28+
io.k8s.display-name="Red Hat OpenShift Pipelines tektoncd-pruner Controller" \
29+
io.k8s.description="Red Hat OpenShift Pipelines tektoncd-pruner Controller" \
30+
io.openshift.tags="pipelines,tekton,openshift"
2731

28-
RUN microdnf install -y shadow-utils
2932
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3033
USER 65532
34+
35+
ENTRYPOINT $CONTROLLER

.konflux/dockerfiles/webhook.Dockerfile

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)