Skip to content

Commit 4b21cbf

Browse files
committed
update rpms.lock.yaml to match with latest ec policy
Signed-off-by: savitaashture <[email protected]>
1 parent eceb873 commit 4b21cbf

11 files changed

+145
-656
lines changed

.konflux/dockerfiles/controller.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Controller" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/dockerfiles/entrypoint.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -35,9 +35,8 @@ 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
39+
4140
USER 65532
4241

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

.konflux/dockerfiles/events.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Events" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/dockerfiles/nop.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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+
ARG MID_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33
ARG RUNTIME=scratch
44

55
FROM $GO_BUILDER AS builder

.konflux/dockerfiles/resolvers.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Resolvers" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/dockerfiles/sidecarlogresults.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Sidecarlogresults" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/dockerfiles/webhook.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Webhook" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/dockerfiles/workingdirinit.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
2+
ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:db8bf20cac0f250659f1ffbba929639dcd7e09863c20c99c5cb8f3ce8ded0497
33

44
FROM $GO_BUILDER AS builder
55

@@ -34,9 +34,8 @@ LABEL \
3434
io.k8s.description="Red Hat OpenShift Pipelines Workingdirinit" \
3535
io.openshift.tags="pipelines,tekton,openshift"
3636

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

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

.konflux/rpms/rpms.in.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contentOrigin:
22
repofiles:
33
- ./ubi.repo
4-
packages: [shadow-utils]
4+
packages: [openssl-libs-3.2.2-6.el9_5.1]
55
arches:
66
# The list of architectures
77
- aarch64

0 commit comments

Comments
 (0)