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-alibaba-cloud-csi-driver

OCPBUGS-24122: Updating ose-alibaba-cloud-csi-driver-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Nov 30, 2023
2 parents 613efac + fc90d03 commit be4888d
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.15
tag: rhel-9-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.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/kubernetes-sigs/alibaba-cloud-csi-driver
COPY . .
# Build the disk CSI driver binary. Do not build docker image.
RUN build/build-all-amd.sh noimage

FROM registry.ci.openshift.org/ocp/4.15:base
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
# Get mkfs & blkid & pciutils
RUN yum update -y && \
yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux ca-certificates file tzdata nfs-utils pciutils && \
Expand Down

0 comments on commit be4888d

Please sign in to comment.