diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7cd14bfef..7096df34e 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 a5733c4cc..2b52fad18 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,10 +1,10 @@ -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/machine-api-provider-gcp COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ && make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0 -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/machine-api-provider-gcp/bin/machine-controller-manager / COPY --from=builder /go/src/github.com/openshift/machine-api-provider-gcp/bin/termination-handler /