Skip to content

Commit

Permalink
Merge pull request #86 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….15-ose-machine-api-provider-azure

OCPBUGS-24168: Updating ose-machine-api-provider-azure-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Dec 6, 2023
2 parents 4de2d82 + 169dbe3 commit 91204c4
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-8-release-golang-1.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile.rhel
Expand Up @@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
RUN unset VERSION \
&& GOPROXY=off NO_DOCKER=1 make build

FROM registry.ci.openshift.org/ocp/4.15:base
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /

Expand Down

0 comments on commit 91204c4

Please sign in to comment.