Skip to content

Commit

Permalink
Merge pull request #488 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.16-ose-aws-cluster-api-controllers

OCPBUGS-24928: Updating ose-aws-cluster-api-controllers-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Dec 13, 2023
2 parents 2805ca2 + 2bdde6b commit 4c2d9b8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -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 openshift/Dockerfile.openshift
@@ -1,4 +1,4 @@
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 /build
COPY . .
Expand All @@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
-o=cluster-api-provider-aws-controller-manager \
main.go

FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9

LABEL description="Cluster API Provider AWS Controller Manager"

Expand Down

0 comments on commit 4c2d9b8

Please sign in to comment.