Skip to content

Commit

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

OCPBUGS-19134: Updating ose-gcp-pd-csi-driver images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Sep 18, 2023
2 parents 5856e47 + 0a352f8 commit d664798
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,10 +1,10 @@
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-compute-persistent-disk-csi-driver
COPY . .
# Skip Windows driver build
RUN make gce-pd-driver

FROM registry.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.15:base

# Get all deps
# nvme-cli and /usr/bin/xxd are deps of google_nvme_id
Expand Down

0 comments on commit d664798

Please sign in to comment.