Skip to content

Commit

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

OCPBUGS-31286: Updating ose-olm-catalogd-container image to be consistent with ART for 4.16
  • Loading branch information
openshift-merge-bot[bot] committed Apr 8, 2024
2 parents ff172fe + 94ae2be commit 8213041
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
@@ -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
Expand Up @@ -2,7 +2,7 @@ module github.com/operator-framework/catalogd

go 1.21

toolchain go1.21.8
toolchain go1.21.7

require (
github.com/blang/semver/v4 v4.0.0
Expand Down
4 changes: 2 additions & 2 deletions openshift/Dockerfile
@@ -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 8213041

Please sign in to comment.