Skip to content

Commit cd6cd40

Browse files
Merge pull request #88 from openshift-bot/art-consistency-openshift-4.16-ose-machine-api-provider-azure
OCPBUGS-25008: Updating ose-machine-api-provider-azure-container image to be consistent with ART
2 parents 91204c4 + d5b6aca commit cd6cd40

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.20-openshift-4.15
4+
tag: rhel-9-release-golang-1.20-openshift-4.16

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.20-openshift-4.15 AS builder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 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.15:base-rhel9
22+
FROM registry.ci.openshift.org/ocp/4.16: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)