Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-24970: Updating ose-machine-api-provider-gcp-container image to be consistent with ART #73

Merged
merged 1 commit into from
Dec 13, 2023
Merged

OCPBUGS-24970: Updating ose-machine-api-provider-gcp-container image to be consistent with ART #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.16
4 changes: 2 additions & 2 deletions Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 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-rhel9
FROM registry.ci.openshift.org/ocp/4.16: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 /