Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#199 from openshift-cherrypick-robo…
Browse files Browse the repository at this point in the history
…t/cherry-pick-198-to-release-4.10

[release-4.10] Bug 2050190: Fix build on ARM after rebase
  • Loading branch information
openshift-merge-robot authored Feb 7, 2022
2 parents 153118c + f5fa465 commit 8ba0c7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
COPY . .
RUN make
RUN make ARCH=$(go env GOARCH)

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
# Get mkfs & blkid
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.openshift.rhel7
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
COPY . .
RUN make
RUN make ARCH=$(go env GOARCH)

FROM registry.ci.openshift.org/ocp/4.10:base
# Get mkfs & blkid
Expand Down

0 comments on commit 8ba0c7a

Please sign in to comment.