Skip to content

Commit a038df6

Browse files
committed
Fix CVE for crypto and net package and update dockerfile
Signed-off-by: savitaashture <[email protected]>
1 parent 5f56976 commit a038df6

File tree

417 files changed

+48777
-15832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+48777
-15832
lines changed

.konflux/dockerfiles/controller.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/controller
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV CONTROLLER=/usr/local/bin/controller \
1919
KO_APP=/ko-app \
@@ -33,9 +33,7 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Controller" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3937
USER 65532
4038

4139
ENTRYPOINT ["/ko-app/controller"]

.konflux/dockerfiles/entrypoint.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -15,7 +15,7 @@ RUN CGO_ENABLED=0 \
1515
./cmd/entrypoint
1616

1717
FROM $RUNTIME
18-
ARG VERSION=pipeline-next
18+
ARG VERSION=pipeline-1-14
1919

2020
ENV ENTRYPOINT=/usr/local/bin/entrypoint \
2121
KO_APP=/ko-app \
@@ -35,9 +35,7 @@ LABEL \
3535
io.k8s.description="Red Hat OpenShift Pipelines Entrypoint" \
3636
io.openshift.tags="pipelines,tekton,openshift"
3737

38-
RUN microdnf install -y shadow-utils && \
39-
groupadd -r -g 65532 nonroot && \
40-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
38+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
4139
USER 65532
4240

4341
ENTRYPOINT ["/ko-app/entrypoint"]

.konflux/dockerfiles/events.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/events
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV EVENTS=/usr/local/bin/events \
1919
KO_APP=/ko-app \
@@ -33,9 +33,7 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Events" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3937
USER 65532
4038

4139
ENTRYPOINT ["/ko-app/events"]

.konflux/dockerfiles/nop.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
22
ARG RUNTIME=scratch
33

44
FROM $GO_BUILDER AS builder
@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/nop
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV NOP=/usr/local/bin/nop \
1919
KO_APP=/ko-app \

.konflux/dockerfiles/resolvers.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/resolvers
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV RESOLVERS=/usr/local/bin/resolvers \
1919
KO_APP=/ko-app \
@@ -33,9 +33,7 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Resolvers" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3937
USER 65532
4038

4139
ENTRYPOINT ["/ko-app/resolvers"]

.konflux/dockerfiles/sidecarlogresults.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/sidecarlogresults
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV SIDECARLOGRESULTS=/usr/local/bin/sidecarlogresults \
1919
KO_APP=/ko-app \
@@ -33,9 +33,7 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Sidecarlogresults" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3937
USER 65532
4038

4139
ENTRYPOINT ["/ko-app/sidecarlogresults"]

.konflux/dockerfiles/webhook.Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/webhook
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV WEBHOOK=/usr/local/bin/webhook \
1919
KO_APP=/ko-app \
@@ -33,9 +33,8 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Webhook" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
37+
3938
USER 65532
4039

4140
ENTRYPOINT ["/ko-app/webhook"]

.konflux/dockerfiles/workingdirinit.Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
2-
ARG RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal@sha256:33161cf5ec11ea13bfe60cad64f56a3aa4d893852e8ec44b2fd2a6b40cc38539
1+
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.21
2+
ARG RUNTIME=registry.redhat.io/ubi8/ubi:latest@sha256:8bd1b6306f8164de7fb0974031a0f903bd3ab3e6bcab835854d3d9a1a74ea5db
33

44
FROM $GO_BUILDER AS builder
55

@@ -13,7 +13,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vend
1313
./cmd/workingdirinit
1414

1515
FROM $RUNTIME
16-
ARG VERSION=pipeline-next
16+
ARG VERSION=pipeline-1-14
1717

1818
ENV WORKINGDIRINIT=/usr/local/bin/workingdirinit \
1919
KO_APP=/ko-app \
@@ -33,9 +33,7 @@ LABEL \
3333
io.k8s.description="Red Hat OpenShift Pipelines Workingdirinit" \
3434
io.openshift.tags="pipelines,tekton,openshift"
3535

36-
RUN microdnf install -y shadow-utils && \
37-
groupadd -r -g 65532 nonroot && \
38-
useradd --no-log-init -r -u 65532 -g nonroot nonroot
36+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
3937
USER 65532
4038

4139
ENTRYPOINT ["/ko-app/workingdirinit"]

.tekton/tektoncd-pipeline-1-15-controller-pull-request.yaml

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

.tekton/tektoncd-pipeline-1-15-controller-push.yaml

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

0 commit comments

Comments
 (0)