Skip to content

Commit

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

OCPBUGS-24075: Updating ose-azure-file-csi-driver-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] authored Nov 30, 2023
2 parents d2b7632 + ade782b commit 469c486
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.15
tag: rhel-9-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.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/azure-file-csi-driver
COPY . .
RUN make azurefile ARCH=$(go env GOARCH) && cp _output/$(go env GOARCH)/azurefileplugin .

FROM registry.ci.openshift.org/ocp/4.15:base
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
COPY --from=builder /go/src/github.com/openshift/azure-file-csi-driver/azurefileplugin /bin/azurefileplugin
RUN yum install -y cifs-utils util-linux nfs-utils e2fsprogs xfsprogs ca-certificates && yum clean all && rm -rf /var/cache/yum

Expand Down

0 comments on commit 469c486

Please sign in to comment.