From 7e3941053ac881679ba74d0c5a6ff04fe6caf79c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 8 Dec 2023 20:07:23 +0000 Subject: [PATCH] Updating ose-alibaba-machine-controllers-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e2ec932f1594e3f5be49ab6d1b9003218c6f81ce/images/ose-alibaba-machine-controllers.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7cd14bfe..7096df34 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.20-openshift-4.15 + tag: rhel-9-release-golang-1.20-openshift-4.15 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 294baa92..4f9af0f8 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder WORKDIR /go/src/github.com/openshift/cluster-api-provider-alibaba COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ && GOPROXY=off NO_DOCKER=1 make build -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-alibaba/bin/machine-controller-manager /