From 8447d8b56115c47eb47a248ff10a921362fc82a3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 9 Nov 2020 13:44:44 +0100 Subject: [PATCH] UPSTREAM: : Add Dockerfile for the admission webhook And update all Dockerfiles to 4.7 --- Dockerfile.openshift | 4 ++-- Dockerfile.openshift.rhel7 | 2 +- Dockerfile.snapshot-controller.openshift.rhel7 | 4 ++-- Dockerfile.webhook.openshift.rhel7 | 8 ++++++++ 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 Dockerfile.webhook.openshift.rhel7 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 3a06f1880..f55302334 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,8 +1,8 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter COPY . . RUN make build -FROM registry.svc.ci.openshift.org/ocp/4.6:base +FROM registry.svc.ci.openshift.org/ocp/4.7:base COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/ ENTRYPOINT ["/usr/bin/csi-snapshotter"] diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index 82b67d699..efd0eb688 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -3,6 +3,6 @@ WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter COPY . . RUN make build -FROM registry.svc.ci.openshift.org/ocp/4.6:base +FROM registry.svc.ci.openshift.org/ocp/4.7:base COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/csi-snapshotter /usr/bin/ ENTRYPOINT ["/usr/bin/csi-snapshotter"] diff --git a/Dockerfile.snapshot-controller.openshift.rhel7 b/Dockerfile.snapshot-controller.openshift.rhel7 index 77cb58c58..1215320e0 100644 --- a/Dockerfile.snapshot-controller.openshift.rhel7 +++ b/Dockerfile.snapshot-controller.openshift.rhel7 @@ -1,8 +1,8 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter COPY . . RUN make build -FROM registry.svc.ci.openshift.org/ocp/4.6:base +FROM registry.svc.ci.openshift.org/ocp/4.7:base COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/snapshot-controller /usr/bin/ ENTRYPOINT ["/usr/bin/snapshot-controller"] diff --git a/Dockerfile.webhook.openshift.rhel7 b/Dockerfile.webhook.openshift.rhel7 new file mode 100644 index 000000000..95ec8934b --- /dev/null +++ b/Dockerfile.webhook.openshift.rhel7 @@ -0,0 +1,8 @@ +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder +WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter +COPY . . +RUN make build + +FROM registry.svc.ci.openshift.org/ocp/4.7:base +COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/bin/snapshot-validation-webhook /usr/bin/ +ENTRYPOINT ["/usr/bin/snapshot-validation-webhook"]