Allow to pass opm image via ARG

openshift-knative · Oct 7, 2024 · 38e6902 · 38e6902
1 parent 3e09635
commit 38e6902
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/olm-catalog/serverless-operator/index/Dockerfile b/olm-catalog/serverless-operator/index/Dockerfile
@@ -1,4 +1,6 @@
-FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17 AS opm
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.17:operator-registry
+
+FROM $OPM_IMAGE AS opm
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
 
@@ -19,7 +21,7 @@ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
+FROM $OPM_IMAGE
 
 # Copy declarative config root into image at /configs
 COPY --from=builder /configs /configs

diff --git a/templates/index.Dockerfile b/templates/index.Dockerfile
@@ -1,4 +1,6 @@
-FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v__OCP_MAX_VERSION__ AS opm
+ARG OPM_IMAGE=registry.ci.openshift.org/origin/__OCP_MAX_VERSION__:operator-registry
+
+FROM $OPM_IMAGE AS opm
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
 
@@ -15,7 +17,7 @@ RUN /bin/opm render --skip-tls-verify -o yaml \
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v__OCP_MAX_VERSION__
+FROM $OPM_IMAGE
 
 # Copy declarative config root into image at /configs
 COPY --from=builder /configs /configs