Skip to content

Commit

Permalink
Merge pull request #89 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….16-ose-olm-operator-controller

OCPBUGS-31285: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16
  • Loading branch information
openshift-merge-bot[bot] committed Mar 28, 2024
2 parents 9bdb1d1 + 1000454 commit cdbbea5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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.21-openshift-4.16
tag: rhel-9-release-golang-1.21-openshift-4.16
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/operator-framework/operator-controller

go 1.21

toolchain go1.21.0
toolchain go1.21.7

require (
github.com/Masterminds/semver/v3 v3.2.1
Expand Down
4 changes: 2 additions & 2 deletions openshift/operator-controller.Dockerfile
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.21-openshift-4.16 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /build
COPY . .
RUN make go-build-local

FROM registry.ci.openshift.org/ocp/4.16:base
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
USER 1001
COPY --from=builder /build/bin/manager /manager
COPY openshift/manifests /openshift/manifests
Expand Down

0 comments on commit cdbbea5

Please sign in to comment.