Skip to content

Commit

Permalink
Merge pull request #32 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….16-ose-cluster-kube-cluster-api-operator

OCPBUGS-24887: Updating ose-cluster-kube-cluster-api-operator-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Jan 3, 2024
2 parents 4c6b685 + f6913a8 commit 82d6c98
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
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.16
4 changes: 2 additions & 2 deletions openshift/Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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.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-operator \
cmd/main.go

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

LABEL description="Cluster API Operator"

Expand Down

0 comments on commit 82d6c98

Please sign in to comment.