Use ubi8/ubi-minimal as base and re-generate CI images

mgencur · Jan 19, 2024 · 058af46 · 058af46
1 parent c19ffad
commit 058af46
Show file tree

Hide file tree

Showing 33 changed files with 33 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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