Skip to content

Commit

Permalink
Updating ose-alibaba-machine-controllers-container image to be consis…
Browse files Browse the repository at this point in the history 
…tent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/e2ec932f1594e3f5be49ab6d1b9003218c6f81ce/images/ose-alibaba-machine-controllers.yml
  • Loading branch information
AOS Automation Release Team committed Dec 8, 2023
1 parent 3da1e37 commit 7e39410
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
View file
Original file line number Diff line number Diff line change
@@ -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
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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/cluster-api-provider-alibaba
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers 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/cluster-api-provider-alibaba/bin/machine-controller-manager /

0 comments on commit 7e39410

Please sign in to comment.