Skip to content

Commit ac81d76

Browse files
Merge pull request openshift#96 from openshift-bot/art-consistency-openshift-4.19-ose-machine-api-provider-gcp
OCPBUGS-45733: Updating ose-machine-api-provider-gcp-container image to be consistent with ART for 4.19
2 parents 0eca084 + b650cde commit ac81d76

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.18
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-provider-gcp
33
COPY . .
44
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
55
RUN unset VERSION \
66
&& make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0
77

8-
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
99
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-gcp/bin/machine-controller-manager /
1010
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-gcp/bin/termination-handler /

0 commit comments

Comments
 (0)