From 24822245a6e32c3ad8a8a9331c9fca4942797aa5 Mon Sep 17 00:00:00 2001 From: Serverless QE Robot <86025630+serverless-qe@users.noreply.github.com> Date: Thu, 12 Sep 2024 08:51:00 +0200 Subject: [PATCH] Run `make generate-release` (#1165) Co-authored-by: mgencur Co-authored-by: Pierangelo Di Pilato --- .../knative-images/event_display/Dockerfile | 30 ++++++++++++++----- .../knative-images/heartbeats/Dockerfile | 30 ++++++++++++++----- .../kafka-controller/Dockerfile | 30 ++++++++++++++----- .../kafka-source-controller/Dockerfile | 30 ++++++++++++++----- .../knative-images/migrate/Dockerfile | 30 ++++++++++++++----- .../knative-images/post-install/Dockerfile | 30 ++++++++++++++----- .../knative-images/webhook-kafka/Dockerfile | 30 ++++++++++++++----- .../committed-offset/Dockerfile | 30 ++++++++++++++----- .../Dockerfile | 30 ++++++++++++++----- .../event-sender/Dockerfile | 30 ++++++++++++++----- .../knative-test-images/eventshub/Dockerfile | 30 ++++++++++++++----- .../kafka-consumer/Dockerfile | 30 ++++++++++++++----- .../logs-exporter/Dockerfile | 30 ++++++++++++++----- .../knative-test-images/print/Dockerfile | 30 ++++++++++++++----- .../recordevents/Dockerfile | 30 ++++++++++++++----- .../request-sender/Dockerfile | 30 ++++++++++++++----- .../knative-test-images/watch-cm/Dockerfile | 30 ++++++++++++++----- .../wathola-fetcher/Dockerfile | 30 ++++++++++++++----- .../wathola-forwarder/Dockerfile | 30 ++++++++++++++----- .../wathola-receiver/Dockerfile | 30 ++++++++++++++----- .../wathola-sender/Dockerfile | 30 ++++++++++++++----- 21 files changed, 462 insertions(+), 168 deletions(-) diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index 7a6f635381..f566107252 100755 --- a/openshift/ci-operator/knative-images/event_display/Dockerfile +++ b/openshift/ci-operator/knative-images/event_display/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/event_display. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/cmd/event_display/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/cmd/event_display && \ - cp -r vendor/knative.dev/eventing/cmd/event_display/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/cmd/event_display + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-event-display-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index 18fd7253c7..47a0716e27 100755 --- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/heartbeats. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/cmd/heartbeats/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/cmd/heartbeats && \ - cp -r vendor/knative.dev/eventing/cmd/heartbeats/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/cmd/heartbeats + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-heartbeats-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile index cd08b9ca46..ad0a66221b 100755 --- a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-controller. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p control-plane/cmd/kafka-controller/kodata && \ - go build -o /usr/bin/main ./control-plane/cmd/kafka-controller && \ - cp -r control-plane/cmd/kafka-controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./control-plane/cmd/kafka-controller + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile index ebe7dd1cdc..fad81c074b 100755 --- a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-source-controller. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p control-plane/cmd/kafka-source-controller/kodata && \ - go build -o /usr/bin/main ./control-plane/cmd/kafka-source-controller && \ - cp -r control-plane/cmd/kafka-source-controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./control-plane/cmd/kafka-source-controller + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index 54753318f6..8d248a432b 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate && \ - cp -r vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-migrate-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/post-install/Dockerfile b/openshift/ci-operator/knative-images/post-install/Dockerfile index 66f0f7295c..388d7d2aca 100755 --- a/openshift/ci-operator/knative-images/post-install/Dockerfile +++ b/openshift/ci-operator/knative-images/post-install/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/post-install. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p control-plane/cmd/post-install/kodata && \ - go build -o /usr/bin/main ./control-plane/cmd/post-install && \ - cp -r control-plane/cmd/post-install/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./control-plane/cmd/post-install + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile index e11c4be124..3e70542c49 100755 --- a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/webhook-kafka. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p control-plane/cmd/webhook-kafka/kodata && \ - go build -o /usr/bin/main ./control-plane/cmd/webhook-kafka && \ - cp -r control-plane/cmd/webhook-kafka/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./control-plane/cmd/webhook-kafka + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile index 9f69b52819..36c5139170 100755 --- a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile +++ b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/committed-offset. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/committed-offset/kodata && \ - go build -o /usr/bin/main ./test/test_images/committed-offset && \ - cp -r test/test_images/committed-offset/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/committed-offset + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile index 1f3003560b..741f079878 100755 --- a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile +++ b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/consumer-group-lag-provider-test. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/consumer-group-lag-provider-test/kodata && \ - go build -o /usr/bin/main ./test/test_images/consumer-group-lag-provider-test && \ - cp -r test/test_images/consumer-group-lag-provider-test/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/consumer-group-lag-provider-test + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile index 6c4dfb796a..9ddb707031 100755 --- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/event-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/event-sender/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/event-sender && \ - cp -r vendor/knative.dev/eventing/test/test_images/event-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/event-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index ae1f77cc17..77f6d5125b 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/reconciler-test/cmd/eventshub. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/reconciler-test/cmd/eventshub/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/reconciler-test/cmd/eventshub && \ - cp -r vendor/knative.dev/reconciler-test/cmd/eventshub/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/reconciler-test/cmd/eventshub + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-eventshub-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-eventshub-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile index 313cc23042..a9da525856 100755 --- a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/kafka-consumer. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/kafka-consumer/kodata && \ - go build -o /usr/bin/main ./test/test_images/kafka-consumer && \ - cp -r test/test_images/kafka-consumer/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/kafka-consumer + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-kafka-consumer-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-kafka-consumer-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile index 5e5e057c47..35d4cf4ac9 100755 --- a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile +++ b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/cmd/logs-exporter. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/cmd/logs-exporter/kodata && \ - go build -o /usr/bin/main ./test/cmd/logs-exporter && \ - cp -r test/cmd/logs-exporter/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/cmd/logs-exporter + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-logs-exporter-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-logs-exporter-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile index d3990cd571..778b8b0908 100755 --- a/openshift/ci-operator/knative-test-images/print/Dockerfile +++ b/openshift/ci-operator/knative-test-images/print/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/print. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/print/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/print && \ - cp -r vendor/knative.dev/eventing/test/test_images/print/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/print + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index 93b3800c96..ade915341f 100755 --- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile +++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/recordevents. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/recordevents/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/recordevents && \ - cp -r vendor/knative.dev/eventing/test/test_images/recordevents/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/recordevents + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile index db75613286..82a686293c 100755 --- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/request-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/request-sender/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/request-sender && \ - cp -r vendor/knative.dev/eventing/test/test_images/request-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/request-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile index c45dc3076d..c309557b0f 100755 --- a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile +++ b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/cmd/watch-cm. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/cmd/watch-cm/kodata && \ - go build -o /usr/bin/main ./test/cmd/watch-cm && \ - cp -r test/cmd/watch-cm/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/cmd/watch-cm + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-watch-cm-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-watch-cm-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index be01c14da1..b875b28104 100755 --- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-fetcher. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/wathola-fetcher/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-fetcher && \ - cp -r vendor/knative.dev/eventing/test/test_images/wathola-fetcher/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-fetcher + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index a8e73d1622..8db3e3c675 100755 --- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-forwarder. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/wathola-forwarder/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-forwarder && \ - cp -r vendor/knative.dev/eventing/test/test_images/wathola-forwarder/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-forwarder + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index 890a60667d..92f5711747 100755 --- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-receiver. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/wathola-receiver/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-receiver && \ - cp -r vendor/knative.dev/eventing/test/test_images/wathola-receiver/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-receiver + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index e96b206638..18e4045464 100755 --- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/eventing/test/test_images/wathola-sender/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-sender && \ - cp -r vendor/knative.dev/eventing/test/test_images/wathola-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/eventing/test/test_images/wathola-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" + ENTRYPOINT ["/usr/bin/main"]