From a8e44b958014e0eddb2d4bb8907e9273a528741f Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 10 Jun 2019 13:43:39 +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 851bb47141a72778c935e80f1a937d3a15fcec76 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 10 Jun 2019 14:54:40 +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 0e48f3666..bd1d6a608 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/external-snapshotter COPY . . -RUN go build ./cmd/csi-snapshotter +RUN make build FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base -COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/ +COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/ RUN useradd csi-snapshotter USER csi-snapshotter ENTRYPOINT ["/usr/bin/csi-snapshotter"] diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index d7ff8a2a1..b7b60c8a6 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/external-snapshotter COPY . . -RUN go build ./cmd/csi-snapshotter +RUN make build FROM registry.svc.ci.openshift.org/ocp/4.0:base -COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/ +COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/ RUN useradd csi-snapshotter USER csi-snapshotter ENTRYPOINT ["/usr/bin/csi-snapshotter"]