Skip to content

Commit

Permalink
Merge pull request #1525 from openshift-bot/art-consistency-openshift…
Browse files Browse the repository at this point in the history
…-4.12-hypershift

Updating hypershift images to be consistent with ART
  • Loading branch information
openshift-ci[bot] committed Jul 7, 2022
2 parents a6e5aef + c1ae2b2 commit 82d3c60
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.18-openshift-4.11
tag: rhel-8-release-golang-1.18-openshift-4.12
4 changes: 2 additions & 2 deletions Dockerfile.control-plane
@@ -1,12 +1,12 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder

WORKDIR /hypershift

COPY . .

RUN make control-plane-operator

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base
COPY --from=builder /hypershift/bin/control-plane-operator /usr/bin/control-plane-operator

ENTRYPOINT /usr/bin/control-plane-operator
Expand Down

0 comments on commit 82d3c60

Please sign in to comment.