From faf2f1153b9f63a3ebbe6d930ea5c91d7638226e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 7 Nov 2024 09:11:05 +0100 Subject: [PATCH] [release-v1.14] Install tzdata (#944) * Install tzdata in Dockerfiles * Run generate.sh --- openshift/ci-operator/build-image/Dockerfile | 19 +++++----- .../apiserver_receive_adapter/Dockerfile | 36 +++++++++++++------ .../knative-images/appender/Dockerfile | 36 +++++++++++++------ .../channel_controller/Dockerfile | 36 +++++++++++++------ .../channel_dispatcher/Dockerfile | 36 +++++++++++++------ .../knative-images/controller/Dockerfile | 36 +++++++++++++------ .../knative-images/event_display/Dockerfile | 36 +++++++++++++------ .../knative-images/filter/Dockerfile | 36 +++++++++++++------ .../knative-images/heartbeats/Dockerfile | 36 +++++++++++++------ .../heartbeats_receiver/Dockerfile | 36 +++++++++++++------ .../knative-images/ingress/Dockerfile | 36 +++++++++++++------ .../knative-images/migrate/Dockerfile | 36 +++++++++++++------ .../mtchannel_broker/Dockerfile | 36 +++++++++++++------ .../knative-images/mtping/Dockerfile | 36 +++++++++++++------ .../knative-images/pong/Dockerfile | 36 +++++++++++++------ .../knative-images/schema/Dockerfile | 36 +++++++++++++------ .../knative-images/webhook/Dockerfile | 36 +++++++++++++------ .../knative-images/websocketsource/Dockerfile | 36 +++++++++++++------ .../event-sender/Dockerfile | 36 +++++++++++++------ .../knative-test-images/eventshub/Dockerfile | 36 +++++++++++++------ .../performance/Dockerfile | 36 +++++++++++++------ .../knative-test-images/print/Dockerfile | 36 +++++++++++++------ .../recordevents/Dockerfile | 36 +++++++++++++------ .../request-sender/Dockerfile | 36 +++++++++++++------ .../wathola-fetcher/Dockerfile | 36 +++++++++++++------ .../wathola-forwarder/Dockerfile | 36 +++++++++++++------ .../wathola-receiver/Dockerfile | 36 +++++++++++++------ .../wathola-sender/Dockerfile | 36 +++++++++++++------ openshift/generate.sh | 1 + 29 files changed, 685 insertions(+), 307 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index db7b13ce002..deaa5319929 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,16 +1,17 @@ # DO NOT EDIT! Generated Dockerfile. +FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools + # Dockerfile to bootstrap build and test in openshift-ci FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder -RUN echo "[kubernetes]" >> /etc/yum.repos.d/kubernetes.repo && \ - echo "name=Kubernetes" >> /etc/yum.repos.d/kubernetes.repo && \ - echo "baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/" >> /etc/yum.repos.d/kubernetes.repo && \ - echo "enabled=1" >> /etc/yum.repos.d/kubernetes.repo && \ - echo "gpgcheck=1" >> /etc/yum.repos.d/kubernetes.repo && \ - echo "gpgkey=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/repodata/repomd.xml.key" >> /etc/yum.repos.d/kubernetes.repo +ARG TARGETARCH + +COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc -RUN yum install -y kubectl httpd-tools +RUN ln -s /usr/bin/oc /usr/bin/kubectl + +RUN yum install -y httpd-tools RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \ chmod 700 ./get-helm-3 @@ -18,10 +19,8 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest +RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/skopeo@v1.16.1 # go install creates $GOPATH/.cache with root permissions, we delete it here # to avoid permission issues with the runtime users RUN rm -rf $GOPATH/.cache - -# Allow runtime users to add entries to /etc/passwd -RUN chmod g+rw /etc/passwd diff --git a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile index 02c5e7040d8..cc14627e7de 100755 --- a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile +++ b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/apiserver_receive_adapter. -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 cmd/apiserver_receive_adapter/kodata && \ - go build -o /usr/bin/main ./cmd/apiserver_receive_adapter && \ - cp -r cmd/apiserver_receive_adapter/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/apiserver_receive_adapter -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/apiserver_receive_adapter USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \ + name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Apiserver Receive Adapter" \ + io.openshift.tags="apiserver-receive-adapter" + +ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"] diff --git a/openshift/ci-operator/knative-images/appender/Dockerfile b/openshift/ci-operator/knative-images/appender/Dockerfile index 65a04fd49a9..bf5cd93f6e1 100755 --- a/openshift/ci-operator/knative-images/appender/Dockerfile +++ b/openshift/ci-operator/knative-images/appender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/appender. -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 cmd/appender/kodata && \ - go build -o /usr/bin/main ./cmd/appender && \ - cp -r cmd/appender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/appender -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/appender USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-appender-rhel8-container" \ + name="openshift-serverless-1/eventing-appender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Appender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Appender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Appender" \ + io.openshift.tags="appender" + +ENTRYPOINT ["/usr/bin/appender"] diff --git a/openshift/ci-operator/knative-images/channel_controller/Dockerfile b/openshift/ci-operator/knative-images/channel_controller/Dockerfile index 93664191204..8881e961966 100755 --- a/openshift/ci-operator/knative-images/channel_controller/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_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 cmd/in_memory/channel_controller/kodata && \ - go build -o /usr/bin/main ./cmd/in_memory/channel_controller && \ - cp -r cmd/in_memory/channel_controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_controller -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/channel_controller USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Controller" \ + io.openshift.tags="in-memory-channel-controller" + +ENTRYPOINT ["/usr/bin/channel_controller"] diff --git a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile index 98404385585..d7919d33f9f 100755 --- a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_dispatcher. -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 cmd/in_memory/channel_dispatcher/kodata && \ - go build -o /usr/bin/main ./cmd/in_memory/channel_dispatcher && \ - cp -r cmd/in_memory/channel_dispatcher/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_dispatcher -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/channel_dispatcher USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \ + name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Dispatcher" \ + io.openshift.tags="in-memory-channel-dispatcher" + +ENTRYPOINT ["/usr/bin/channel_dispatcher"] diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index a35d6b4bf67..782f773938a 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/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 cmd/controller/kodata && \ - go build -o /usr/bin/main ./cmd/controller && \ - cp -r cmd/controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/controller -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/controller USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Controller" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Controller" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Controller" \ + io.openshift.tags="controller" + +ENTRYPOINT ["/usr/bin/controller"] diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index a6ef531c451..333f89c9abd 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 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 cmd/event_display/kodata && \ - go build -o /usr/bin/main ./cmd/event_display && \ - cp -r cmd/event_display/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/event_display -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/event_display USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-event-display-rhel8-container" \ + name="openshift-serverless-1/eventing-event-display-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Event Display" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Event Display" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Event Display" \ + io.openshift.tags="event-display" + +ENTRYPOINT ["/usr/bin/event_display"] diff --git a/openshift/ci-operator/knative-images/filter/Dockerfile b/openshift/ci-operator/knative-images/filter/Dockerfile index 70a8977623c..da12bf48b93 100755 --- a/openshift/ci-operator/knative-images/filter/Dockerfile +++ b/openshift/ci-operator/knative-images/filter/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/broker/filter. -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 cmd/broker/filter/kodata && \ - go build -o /usr/bin/main ./cmd/broker/filter && \ - cp -r cmd/broker/filter/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/broker/filter -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/filter USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \ + name="openshift-serverless-1/eventing-broker-filter-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Filter" \ + io.openshift.tags="broker-filter" + +ENTRYPOINT ["/usr/bin/filter"] diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index 6d7a30b72df..7a418b8a554 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 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 cmd/heartbeats/kodata && \ - go build -o /usr/bin/main ./cmd/heartbeats && \ - cp -r cmd/heartbeats/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/heartbeats -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/heartbeats USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-heartbeats-rhel8-container" \ + name="openshift-serverless-1/eventing-heartbeats-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats" \ + io.openshift.tags="heartbeats" + +ENTRYPOINT ["/usr/bin/heartbeats"] diff --git a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile index 806c93443fb..656aa67fd2e 100755 --- a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/heartbeats_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 cmd/heartbeats_receiver/kodata && \ - go build -o /usr/bin/main ./cmd/heartbeats_receiver && \ - cp -r cmd/heartbeats_receiver/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/heartbeats_receiver -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/heartbeats_receiver USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-heartbeats-receiver-rhel8-container" \ + name="openshift-serverless-1/eventing-heartbeats-receiver-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats Receiver" \ + io.openshift.tags="heartbeats-receiver" + +ENTRYPOINT ["/usr/bin/heartbeats_receiver"] diff --git a/openshift/ci-operator/knative-images/ingress/Dockerfile b/openshift/ci-operator/knative-images/ingress/Dockerfile index 95757d4ecf2..d0c80cc26a2 100755 --- a/openshift/ci-operator/knative-images/ingress/Dockerfile +++ b/openshift/ci-operator/knative-images/ingress/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/broker/ingress. -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 cmd/broker/ingress/kodata && \ - go build -o /usr/bin/main ./cmd/broker/ingress && \ - cp -r cmd/broker/ingress/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/broker/ingress -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/ingress USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-broker-ingress-rhel8-container" \ + name="openshift-serverless-1/eventing-broker-ingress-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Ingress" \ + io.openshift.tags="broker-ingress" + +ENTRYPOINT ["/usr/bin/ingress"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index 54753318f67..60f2ef030c4 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 registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/migrate USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-migrate-rhel8-container" \ + name="openshift-serverless-1/eventing-migrate-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Migrate" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Migrate" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Migrate" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Migrate" \ + io.openshift.tags="migrate" + +ENTRYPOINT ["/usr/bin/migrate"] diff --git a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile index 7029726dc65..ee7a4895a2d 100755 --- a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile +++ b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/mtchannel_broker. -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 cmd/mtchannel_broker/kodata && \ - go build -o /usr/bin/main ./cmd/mtchannel_broker && \ - cp -r cmd/mtchannel_broker/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/mtchannel_broker -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/mtchannel_broker USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-mtchannel-broker-rhel8-container" \ + name="openshift-serverless-1/eventing-mtchannel-broker-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Mtchannel Broker" \ + io.openshift.tags="mtchannel-broker" + +ENTRYPOINT ["/usr/bin/mtchannel_broker"] diff --git a/openshift/ci-operator/knative-images/mtping/Dockerfile b/openshift/ci-operator/knative-images/mtping/Dockerfile index fdd348fb2a4..f97a1b63493 100755 --- a/openshift/ci-operator/knative-images/mtping/Dockerfile +++ b/openshift/ci-operator/knative-images/mtping/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/mtping. -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 cmd/mtping/kodata && \ - go build -o /usr/bin/main ./cmd/mtping && \ - cp -r cmd/mtping/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/mtping -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/mtping USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-mtping-rhel8-container" \ + name="openshift-serverless-1/eventing-mtping-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Mtping" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Mtping" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtping" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Mtping" \ + io.openshift.tags="mtping" + +ENTRYPOINT ["/usr/bin/mtping"] diff --git a/openshift/ci-operator/knative-images/pong/Dockerfile b/openshift/ci-operator/knative-images/pong/Dockerfile index 34a95f1ca3c..d7de726af32 100755 --- a/openshift/ci-operator/knative-images/pong/Dockerfile +++ b/openshift/ci-operator/knative-images/pong/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/pong. -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 cmd/pong/kodata && \ - go build -o /usr/bin/main ./cmd/pong && \ - cp -r cmd/pong/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/pong -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/pong USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-pong-rhel8-container" \ + name="openshift-serverless-1/eventing-pong-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Pong" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Pong" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Pong" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Pong" \ + io.openshift.tags="pong" + +ENTRYPOINT ["/usr/bin/pong"] diff --git a/openshift/ci-operator/knative-images/schema/Dockerfile b/openshift/ci-operator/knative-images/schema/Dockerfile index d35b2eb141f..887028f8dd2 100755 --- a/openshift/ci-operator/knative-images/schema/Dockerfile +++ b/openshift/ci-operator/knative-images/schema/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/schema. -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 cmd/schema/kodata && \ - go build -o /usr/bin/main ./cmd/schema && \ - cp -r cmd/schema/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/schema -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/schema USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-schema-rhel8-container" \ + name="openshift-serverless-1/eventing-schema-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Schema" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Schema" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Schema" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Schema" \ + io.openshift.tags="schema" + +ENTRYPOINT ["/usr/bin/schema"] diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 9c6a52ba2dd..e78d8f22376 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/webhook. -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 cmd/webhook/kodata && \ - go build -o /usr/bin/main ./cmd/webhook && \ - cp -r cmd/webhook/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/webhook -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/webhook USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-webhook-rhel8-container" \ + name="openshift-serverless-1/eventing-webhook-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Webhook" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Webhook" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Webhook" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Webhook" \ + io.openshift.tags="webhook" + +ENTRYPOINT ["/usr/bin/webhook"] diff --git a/openshift/ci-operator/knative-images/websocketsource/Dockerfile b/openshift/ci-operator/knative-images/websocketsource/Dockerfile index 9c18e6fd70d..aa9fd796c78 100755 --- a/openshift/ci-operator/knative-images/websocketsource/Dockerfile +++ b/openshift/ci-operator/knative-images/websocketsource/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/websocketsource. -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 cmd/websocketsource/kodata && \ - go build -o /usr/bin/main ./cmd/websocketsource && \ - cp -r cmd/websocketsource/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/websocketsource -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/websocketsource USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-websocketsource-rhel8-container" \ + name="openshift-serverless-1/eventing-websocketsource-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Websocketsource" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Websocketsource" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Websocketsource" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Websocketsource" \ + io.openshift.tags="websocketsource" + +ENTRYPOINT ["/usr/bin/websocketsource"] diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile index 3a4eae90740..87b3ce1ff47 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 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 test/test_images/event-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/event-sender && \ - cp -r 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 ./test/test_images/event-sender -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/event-sender USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-event-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-event-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Event Sender" \ + io.openshift.tags="test-test-images-event-sender" + +ENTRYPOINT ["/usr/bin/event-sender"] diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index ae1f77cc176..d4e54915e85 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 registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/eventshub USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-eventshub-rhel8-container" \ + name="openshift-serverless-1/eventing-eventshub-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Eventshub" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Eventshub" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Eventshub" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Eventshub" \ + io.openshift.tags="eventshub" + +ENTRYPOINT ["/usr/bin/eventshub"] diff --git a/openshift/ci-operator/knative-test-images/performance/Dockerfile b/openshift/ci-operator/knative-test-images/performance/Dockerfile index f5dfb923ccd..fb2e25ed0bf 100755 --- a/openshift/ci-operator/knative-test-images/performance/Dockerfile +++ b/openshift/ci-operator/knative-test-images/performance/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/performance. -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/performance/kodata && \ - go build -o /usr/bin/main ./test/test_images/performance && \ - cp -r test/test_images/performance/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/performance -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/performance USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-performance-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-performance-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Performance" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Performance" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Performance" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Performance" \ + io.openshift.tags="test-test-images-performance" + +ENTRYPOINT ["/usr/bin/performance"] diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile index 9a7e05233bb..9f1b23a800d 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 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 test/test_images/print/kodata && \ - go build -o /usr/bin/main ./test/test_images/print && \ - cp -r test/test_images/print/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/print -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/print USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-print-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-print-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Print" \ + io.openshift.tags="test-test-images-print" + +ENTRYPOINT ["/usr/bin/print"] diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index a4d3588bb7d..45d707ed172 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 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 test/test_images/recordevents/kodata && \ - go build -o /usr/bin/main ./test/test_images/recordevents && \ - cp -r test/test_images/recordevents/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/recordevents -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/recordevents USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-recordevents-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-recordevents-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Recordevents" \ + io.openshift.tags="test-test-images-recordevents" + +ENTRYPOINT ["/usr/bin/recordevents"] diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile index b60fcff5c0c..2b91e2d6c00 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 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 test/test_images/request-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/request-sender && \ - cp -r 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 ./test/test_images/request-sender -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/request-sender USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-request-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-request-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Request Sender" \ + io.openshift.tags="test-test-images-request-sender" + +ENTRYPOINT ["/usr/bin/request-sender"] diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index 7793d693264..caaaa055590 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 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 test/test_images/wathola-fetcher/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-fetcher && \ - cp -r 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 ./test/test_images/wathola-fetcher -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/wathola-fetcher USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-fetcher-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-fetcher-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Wathola Fetcher" \ + io.openshift.tags="test-test-images-wathola-fetcher" + +ENTRYPOINT ["/usr/bin/wathola-fetcher"] diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index cc1f17782b5..c8bf948d74f 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 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 test/test_images/wathola-forwarder/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-forwarder && \ - cp -r 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 ./test/test_images/wathola-forwarder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/wathola-forwarder USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-forwarder-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-forwarder-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Wathola Forwarder" \ + io.openshift.tags="test-test-images-wathola-forwarder" + +ENTRYPOINT ["/usr/bin/wathola-forwarder"] diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index c0822ebbf45..00331380676 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 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 test/test_images/wathola-receiver/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-receiver && \ - cp -r 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 ./test/test_images/wathola-receiver -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/wathola-receiver USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-receiver-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-receiver-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Wathola Receiver" \ + io.openshift.tags="test-test-images-wathola-receiver" + +ENTRYPOINT ["/usr/bin/wathola-receiver"] diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index bd882860ced..fa31ed8c7a7 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 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 test/test_images/wathola-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-sender && \ - cp -r 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 ./test/test_images/wathola-sender -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM $GO_RUNTIME -# install the missing zoneinfo to ubi-minimal -RUN microdnf install tzdata +ARG VERSION=knative-v1.14 +RUN microdnf update tzdata -y && microdnf reinstall tzdata -y + +COPY --from=builder /usr/bin/main /usr/bin/wathola-sender USER 65532 -COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko -ENTRYPOINT ["/usr/bin/main"] +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" \ + io.k8s.description="Red Hat OpenShift Serverless Eventing Test Test Images Wathola Sender" \ + io.openshift.tags="test-test-images-wathola-sender" + +ENTRYPOINT ["/usr/bin/wathola-sender"] diff --git a/openshift/generate.sh b/openshift/generate.sh index 23ef82774fc..ad6b25f1258 100755 --- a/openshift/generate.sh +++ b/openshift/generate.sh @@ -14,4 +14,5 @@ rm -rf "$hack_tmp_dir" $(go env GOPATH)/bin/generate \ --root-dir "${repo_root_dir}" \ --generators dockerfile \ + --additional-packages tzdata \ --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"