Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjustments for OpenShift 4.2 #12

Merged
merged 3 commits into from
Jun 10, 2019
Merged

Adjustments for OpenShift 4.2 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba282be
UPSTREAM: <carry>: Remove Matthew from OWNERS
jsafrane Jun 10, 2019
742ef82
UPSTREAM: <carry>: Use upstream makefiles
jsafrane Jun 10, 2019
537b833
UPSTREAM: <carry>: Use go 1.11
jsafrane Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
WORKDIR /go/src/github.com/kubernetes-csi/external-provisioner
COPY . .
RUN go build ./cmd/csi-provisioner
RUN make build

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/csi-provisioner /usr/bin/
COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/bin/csi-provisioner /usr/bin/
RUN useradd csi-provisioner
USER csi-provisioner
ENTRYPOINT ["/usr/bin/csi-provisioner"]
6 changes: 3 additions & 3 deletions Dockerfile.openshift.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
WORKDIR /go/src/github.com/kubernetes-csi/external-provisioner
COPY . .
RUN go build ./cmd/csi-provisioner
RUN make build

FROM registry.svc.ci.openshift.org/ocp/4.0:base
COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/csi-provisioner /usr/bin/
COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/bin/csi-provisioner /usr/bin/
RUN useradd csi-provisioner
USER csi-provisioner
ENTRYPOINT ["/usr/bin/csi-provisioner"]
1 change: 0 additions & 1 deletion OWNERS_ALIASES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ aliases:
- jsafrane
- tsmetana
- gnufied
- wongma7
- childsb
- bertinatto