From 727a59f6d9c5a3628e8a5df0c0292f734ea5ee59 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 5 Sep 2024 21:56:47 +0000 Subject: [PATCH] Updating kube-compare-artifacts-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/kube-compare-artifacts.yml --- .ci-operator.yaml | 4 ++++ Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .ci-operator.yaml diff --git a/.ci-operator.yaml b/.ci-operator.yaml new file mode 100644 index 00000000..64887a08 --- /dev/null +++ b/.ci-operator.yaml @@ -0,0 +1,4 @@ +build_root_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/Dockerfile b/Dockerfile index 79f3ba4b..2e40a71f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ # This Dockerfile builds an image containing the Mac and Windows version of kube-compare # layered on top of the Linux cli image. -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-builder-multi-openshift-4.17 AS builder-rhel-8 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 AS builder-rhel-8 WORKDIR /go/src/github.com/openshift/kube-compare COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-builder-multi-openshift-4.17 AS builder-rhel-9 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder-rhel-9 WORKDIR /go/src/github.com/openshift/kube-compare COPY . . RUN make cross-build --warn-undefined-variables -FROM --platform=linux/amd64 registry.ci.openshift.org/ocp/4.17:cli as final-builder +FROM registry.ci.openshift.org/ocp/4.18:cli AS final-builder COPY --from=builder-rhel-9 /go/src/github.com/openshift/kube-compare/_output/bin/ /usr/share/openshift/