Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#19 from openshift-bot/art-consiste…
Browse files Browse the repository at this point in the history
…ncy-openshift-4.15-ose-gcp-filestore-csi-driver

OCPBUGS-19113: Updating ose-gcp-filestore-csi-driver images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Sep 18, 2023
2 parents aff4c12 + 0ef6097 commit a9c32fb
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
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.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile.openshift
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.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/kubernetes-sigs/gcp-filestore-csi-driver
COPY . .
RUN make driver

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/kubernetes-sigs/gcp-filestore-csi-driver/bin/gcp-filestore-csi-driver /usr/bin/
RUN yum update -y && \
yum install --setopt=tsflags=nodocs -y nfs-utils util-linux && \
Expand Down

0 comments on commit a9c32fb

Please sign in to comment.