Skip to content

Commit

Permalink
Merge pull request #85 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….15-ose-gcp-pd-csi-driver-operator

OCPBUGS-19229: Updating ose-gcp-pd-csi-driver-operator images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Sep 18, 2023
2 parents 999fb4c + ec4d4b7 commit 03c95f5
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.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile.openshift
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/gcp-pd-csi-driver-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.15:base
COPY --from=builder /go/src/github.com/openshift/gcp-pd-csi-driver-operator/gcp-pd-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/gcp-pd-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift GCP PD CSI Driver Operator" \
Expand Down

0 comments on commit 03c95f5

Please sign in to comment.