Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #72 from openshift-bot/art-consistency-openshift-4…
….15-ose-machine-api-provider-gcp OCPBUGS-24143: Updating ose-machine-api-provider-gcp-container image to be consistent with ART
- Loading branch information
Showing
2 changed files
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 / |