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
….16-ose-alibaba-disk-csi-driver-operator

OCPBUGS-28849: Updating ose-alibaba-disk-csi-driver-operator-container image to be consistent with ART for 4.16
  • Loading branch information
openshift-merge-bot[bot] committed Feb 12, 2024
2 parents f510004 + c20942f commit 02dd1e3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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.21-openshift-4.16
tag: rhel-9-release-golang-1.21-openshift-4.16
4 changes: 2 additions & 2 deletions Dockerfile
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.21-openshift-4.16 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/alibaba-disk-csi-driver-operator
COPY . .
RUN make

FROM registry.ci.openshift.org/ocp/4.16:base
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
COPY --from=builder /go/src/github.com/openshift/alibaba-disk-csi-driver-operator/alibaba-disk-csi-driver-operator /usr/bin/
ENTRYPOINT ["/usr/bin/alibaba-disk-csi-driver-operator"]
LABEL io.k8s.display-name="OpenShift Alibaba Disk CSI Driver Operator" \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/alibaba-disk-csi-driver-operator

go 1.20
go 1.21

require (
github.com/google/go-cmp v0.6.0
Expand Down

0 comments on commit 02dd1e3

Please sign in to comment.