diff --git a/openshift/ci-operator/Dockerfile.in b/openshift/ci-operator/Dockerfile.in index 32b94bfb199c..2c7055cb2cec 100644 --- a/openshift/ci-operator/Dockerfile.in +++ b/openshift/ci-operator/Dockerfile.in @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/${bin} /ko-app/${bin} diff --git a/openshift/ci-operator/Dockerfile_with_kodata.in b/openshift/ci-operator/Dockerfile_with_kodata.in index 00de7209562b..42a012cd2db9 100644 --- a/openshift/ci-operator/Dockerfile_with_kodata.in +++ b/openshift/ci-operator/Dockerfile_with_kodata.in @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ${kodata_path} /var/run/ko diff --git a/openshift/ci-operator/knative-images/activator/Dockerfile b/openshift/ci-operator/knative-images/activator/Dockerfile index c8bc07e8c4ff..1bd1733cd65a 100644 --- a/openshift/ci-operator/knative-images/activator/Dockerfile +++ b/openshift/ci-operator/knative-images/activator/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/activator/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile index ac0866d15e32..8c0200ec4cdb 100644 --- a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/autoscaler-hpa/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-images/autoscaler/Dockerfile b/openshift/ci-operator/knative-images/autoscaler/Dockerfile index 62a8a1712ccf..fd6800d6c065 100644 --- a/openshift/ci-operator/knative-images/autoscaler/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/autoscaler/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index e78c8ad377b1..871acf2e9ace 100644 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/controller/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index c009386b05ba..76fc0439c274 100644 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/migrate /ko-app/migrate diff --git a/openshift/ci-operator/knative-images/queue/Dockerfile b/openshift/ci-operator/knative-images/queue/Dockerfile index aaf7b287106d..d7c5d3704987 100644 --- a/openshift/ci-operator/knative-images/queue/Dockerfile +++ b/openshift/ci-operator/knative-images/queue/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/queue/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 91c9e6733198..2e408b61a7f3 100644 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY ./cmd/webhook/kodata /var/run/ko diff --git a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile index 38e7b864a153..5e6ec8704d26 100644 --- a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/dataplane-probe /ko-app/dataplane-probe diff --git a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile index cc7935e16892..b80147d658dc 100644 --- a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/load-test /ko-app/load-test diff --git a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile index ac4d4f898932..c9c1eea048cb 100644 --- a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/real-traffic-test /ko-app/real-traffic-test diff --git a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile index 7d6f3c0bf0d1..caf478c3ea15 100644 --- a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/reconciliation-delay /ko-app/reconciliation-delay diff --git a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile index f371afab48e2..5d4d03032912 100644 --- a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/rollout-probe /ko-app/rollout-probe diff --git a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile index 1b331b140ed4..02f2ae457e4d 100644 --- a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN ./openshift/in-docker-patch.sh RUN make perf-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/scale-from-zero /ko-app/scale-from-zero diff --git a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile index 0433013da7cf..bbe17695b318 100644 --- a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile +++ b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/autoscale /ko-app/autoscale diff --git a/openshift/ci-operator/knative-test-images/failing/Dockerfile b/openshift/ci-operator/knative-test-images/failing/Dockerfile index 3b605ef0a434..6c8ea3d2315f 100644 --- a/openshift/ci-operator/knative-test-images/failing/Dockerfile +++ b/openshift/ci-operator/knative-test-images/failing/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/failing /ko-app/failing diff --git a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile index 878fbda3f78f..32bd50c77d1f 100644 --- a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile +++ b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/grpc-ping /ko-app/grpc-ping diff --git a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile index a54581d09783..be4671c31d8b 100644 --- a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/hellohttp2 /ko-app/hellohttp2 diff --git a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile index 14177d2b2635..c1111c97683b 100644 --- a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/hellovolume /ko-app/hellovolume diff --git a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile index 72ff05cf0dc4..d30b2d289886 100644 --- a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile +++ b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/helloworld /ko-app/helloworld diff --git a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile index dda962c5efea..dc549c4ddf54 100644 --- a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile +++ b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/httpproxy /ko-app/httpproxy diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile index 38ec758141a4..fa78265338e4 100644 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/pizzaplanetv1 /ko-app/pizzaplanetv1 diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile index 6532232468f2..5bae25d86eae 100644 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/pizzaplanetv2 /ko-app/pizzaplanetv2 diff --git a/openshift/ci-operator/knative-test-images/readiness/Dockerfile b/openshift/ci-operator/knative-test-images/readiness/Dockerfile index a45c427ea6c7..1dd910f8c1bd 100644 --- a/openshift/ci-operator/knative-test-images/readiness/Dockerfile +++ b/openshift/ci-operator/knative-test-images/readiness/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/readiness /ko-app/readiness diff --git a/openshift/ci-operator/knative-test-images/runtime/Dockerfile b/openshift/ci-operator/knative-test-images/runtime/Dockerfile index ff2c7e201652..ed1884d0336a 100644 --- a/openshift/ci-operator/knative-test-images/runtime/Dockerfile +++ b/openshift/ci-operator/knative-test-images/runtime/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/runtime /ko-app/runtime diff --git a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile index 986e0acee788..a6100aa9af7c 100644 --- a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/servingcontainer /ko-app/servingcontainer diff --git a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile index 971e476d58e0..ec048bd8cdb7 100644 --- a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/sidecarcontainer /ko-app/sidecarcontainer diff --git a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile index d3ffe34c6e56..5a6a64b01fae 100644 --- a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile +++ b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/singlethreaded /ko-app/singlethreaded diff --git a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile index b1a7be0450dd..c6cadb8cfc2c 100644 --- a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile +++ b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/slowstart /ko-app/slowstart diff --git a/openshift/ci-operator/knative-test-images/timeout/Dockerfile b/openshift/ci-operator/knative-test-images/timeout/Dockerfile index 98e3a7873e93..bccdfab7e282 100644 --- a/openshift/ci-operator/knative-test-images/timeout/Dockerfile +++ b/openshift/ci-operator/knative-test-images/timeout/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/timeout /ko-app/timeout diff --git a/openshift/ci-operator/knative-test-images/volumes/Dockerfile b/openshift/ci-operator/knative-test-images/volumes/Dockerfile index bf743756c7e3..e8fce8ba4b64 100644 --- a/openshift/ci-operator/knative-test-images/volumes/Dockerfile +++ b/openshift/ci-operator/knative-test-images/volumes/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/volumes /ko-app/volumes diff --git a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile index 3c1551548ab5..747348ecd1de 100644 --- a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile @@ -4,7 +4,7 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder COPY . . RUN make install test-install -FROM openshift/origin-base +FROM registry.access.redhat.com/ubi8/ubi-minimal USER 65532 COPY --from=builder /go/bin/wsserver /ko-app/wsserver