From 8c2cc2b5f448e944e2e370d449bf9c4437f924e2 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 10 Jun 2019 13:43:40 +0200 Subject: [PATCH 1/2] UPSTREAM: : Remove Matthew from OWNERS --- OWNERS_ALIASES | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 541a3a51a..dd2eec73f 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -3,6 +3,5 @@ aliases: - jsafrane - tsmetana - gnufied - - wongma7 - childsb - bertinatto From bf13ce2335159274171fe23290f0c6a92709cea0 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 10 Jun 2019 14:58:07 +0200 Subject: [PATCH 2/2] UPSTREAM: : Use upstream makefiles This will embed correct version (e.g. v1.1.1-24-g4b930a6) into the binary. --- Dockerfile.openshift | 4 ++-- Dockerfile.openshift.rhel7 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index ad598396b..f68bb0a77 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,10 +1,10 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder WORKDIR /go/src/github.com/kubernetes-csi/node-driver-registrar COPY . . -RUN go build ./cmd/csi-node-driver-registrar +RUN make build FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base -COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/csi-node-driver-registrar /usr/bin/ +COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/bin/csi-node-driver-registrar /usr/bin/ RUN useradd csi-node-driver-registrar USER csi-node-driver-registrar ENTRYPOINT ["/usr/bin/csi-node-driver-registrar"] diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index 42037f394..80c05dd12 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -1,10 +1,10 @@ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/kubernetes-csi/node-driver-registrar COPY . . -RUN go build ./cmd/csi-node-driver-registrar +RUN make build FROM registry.svc.ci.openshift.org/ocp/4.0:base -COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/csi-node-driver-registrar /usr/bin/ +COPY --from=builder /go/src/github.com/kubernetes-csi/node-driver-registrar/bin/csi-node-driver-registrar /usr/bin/ RUN useradd csi-node-driver-registrar USER csi-node-driver-registrar ENTRYPOINT ["/usr/bin/csi-node-driver-registrar"]