From 6634274e8aae0aea8adf9cc359bc00b57b138719 Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Mon, 25 Nov 2024 10:09:54 +0100 Subject: [PATCH] Run make generate-release (#110) * Trigger Image builds * Run make generate-release --- openshift/ci-operator/build-image/Dockerfile | 2 +- openshift/ci-operator/knative-images/eventmesh/Dockerfile | 4 +++- openshift/ci-operator/knative-images/migrate/Dockerfile | 4 +++- .../ci-operator/knative-test-images/eventshub/Dockerfile | 4 +++- openshift/generate.sh | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index eae243c9..deaa5319 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -3,7 +3,7 @@ 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.16 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder ARG TARGETARCH diff --git a/openshift/ci-operator/knative-images/eventmesh/Dockerfile b/openshift/ci-operator/knative-images/eventmesh/Dockerfile index 24bd2b4b..61db65a0 100755 --- a/openshift/ci-operator/knative-images/eventmesh/Dockerfile +++ b/openshift/ci-operator/knative-images/eventmesh/Dockerfile @@ -1,9 +1,10 @@ # DO NOT EDIT! Generated Dockerfile for backends/cmd/eventmesh. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16 +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 +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -16,6 +17,7 @@ FROM $GO_RUNTIME ARG VERSION=knative-v1.16 COPY --from=builder /usr/bin/main /usr/bin/eventmesh +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index a070ce0e..63751a9f 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -1,9 +1,10 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16 +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 +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -16,6 +17,7 @@ FROM $GO_RUNTIME ARG VERSION=knative-v1.16 COPY --from=builder /usr/bin/main /usr/bin/migrate +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index ad4099b5..9edf1d21 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -1,9 +1,10 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/reconciler-test/cmd/eventshub. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16 +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 +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -16,6 +17,7 @@ FROM $GO_RUNTIME ARG VERSION=knative-v1.16 COPY --from=builder /usr/bin/main /usr/bin/eventshub +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/generate.sh b/openshift/generate.sh index e995fa5e..81b7e316 100755 --- a/openshift/generate.sh +++ b/openshift/generate.sh @@ -10,4 +10,4 @@ GOFLAGS='' go install github.com/openshift-knative/hack/cmd/generate@latest $(go env GOPATH)/bin/generate \ --root-dir "${repo_root_dir}" \ --generators dockerfile \ - --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.16" + --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"