Skip to content

Commit b6c35e8

Browse files
Merge pull request #118 from openshift-bot/art-consistency-openshift-4.18-ose-machine-api-provider-azure
OCPBUGS-39581: Updating ose-machine-api-provider-azure-container image to be consistent with ART for 4.18
2 parents 7b2d12f + f8e53e7 commit b6c35e8

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.17
4+
tag: rhel-9-release-golang-1.22-openshift-4.18

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1616
WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
1717
COPY . .
1818
# VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
1919
RUN unset VERSION \
2020
&& GOPROXY=off NO_DOCKER=1 make build
2121

22-
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
22+
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
2323
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
2424
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /
2525

0 commit comments

Comments
 (0)