Skip to content

Commit 32c0ce5

Browse files
author
serverless-qe
committed
Generate dockerfiles with "make generate-release"
1 parent 712e582 commit 32c0ce5

File tree

22 files changed

+130
-109
lines changed

22 files changed

+130
-109
lines changed

openshift/ci-operator/build-image/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# DO NOT EDIT! Generated Dockerfile.
22

3-
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
3+
FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
44

55
# Dockerfile to bootstrap build and test in openshift-ci
6-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 as builder
6+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 as builder
77

88
ARG TARGETARCH
99

10-
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
1111

1212
RUN ln -s /usr/bin/oc /usr/bin/kubectl
1313

14-
RUN yum install -y httpd-tools
14+
RUN dnf install -y httpd-tools
1515

1616
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
1717
chmod 700 ./get-helm-3

openshift/ci-operator/knative-images/event_display/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/event_display.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-event-display-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-event-display-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Event Display" \
33-
io.openshift.tags="event-display"
33+
io.openshift.tags="event-display" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/event_display"]

openshift/ci-operator/knative-images/heartbeats/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/heartbeats.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-heartbeats-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-heartbeats-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Heartbeats" \
33-
io.openshift.tags="heartbeats"
33+
io.openshift.tags="heartbeats" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/heartbeats"]

openshift/ci-operator/knative-images/kafka-controller/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-controller.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Controller" \
33-
io.openshift.tags="kafka-controller"
33+
io.openshift.tags="kafka-controller" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/kafka-controller"]

openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-source-controller.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Source Controller" \
33-
io.openshift.tags="kafka-source-controller"
33+
io.openshift.tags="kafka-source-controller" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/kafka-source-controller"]

openshift/ci-operator/knative-images/migrate/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-migrate-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-migrate-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Migrate" \
33-
io.openshift.tags="migrate"
33+
io.openshift.tags="migrate" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/migrate"]

openshift/ci-operator/knative-images/post-install/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for control-plane/cmd/post-install.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Post Install" \
33-
io.openshift.tags="post-install"
33+
io.openshift.tags="post-install" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/post-install"]

openshift/ci-operator/knative-images/webhook-kafka/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for control-plane/cmd/webhook-kafka.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Webhook Kafka" \
33-
io.openshift.tags="webhook-kafka"
33+
io.openshift.tags="webhook-kafka" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/webhook-kafka"]

openshift/ci-operator/knative-test-images/committed-offset/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for test/test_images/committed-offset.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Committed Offset" \
33-
io.openshift.tags="test-test-images-committed-offset"
33+
io.openshift.tags="test-test-images-committed-offset" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/committed-offset"]

openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for test/test_images/consumer-group-lag-provider-test.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8-container" \
26-
name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel9-container" \
26+
name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
33-
io.openshift.tags="test-test-images-consumer-group-lag-provider-test"
33+
io.openshift.tags="test-test-images-consumer-group-lag-provider-test" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/consumer-group-lag-provider-test"]

0 commit comments

Comments
 (0)