From 2f10964791760166a32f27f89e9f806fd293bad0 Mon Sep 17 00:00:00 2001 From: Sam Batschelet Date: Thu, 29 Nov 2018 11:39:48 -0500 Subject: [PATCH] version: openshift-v4.0 Signed-off-by: Sam Batschelet --- .dockerignore | 1 - Dockerfile.openshift | 20 ++++++++++++++++++++ Dockerfile.rhel | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.openshift create mode 100644 Dockerfile.rhel diff --git a/.dockerignore b/.dockerignore index 6b8710a711f..e69de29bb2d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +0,0 @@ -.git diff --git a/Dockerfile.openshift b/Dockerfile.openshift new file mode 100644 index 00000000000..1327c0d095c --- /dev/null +++ b/Dockerfile.openshift @@ -0,0 +1,20 @@ +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder + +ENV GOPATH /go + +COPY . $GOPATH/src/go.etcd.io/etcd + +RUN yum install -y git && \ + cd $GOPATH/src/go.etcd.io/etcd && \ + make build + +# stage 2 +FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base + +ENTRYPOINT ["/usr/bin/etcd"] + +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/ + +LABEL io.k8s.display-name="etcd server" \ + io.k8s.description="etcd is distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ + maintainer="Sam Batschelet " diff --git a/Dockerfile.rhel b/Dockerfile.rhel new file mode 100644 index 00000000000..991967cbf2a --- /dev/null +++ b/Dockerfile.rhel @@ -0,0 +1,20 @@ +FROM openshift/golang-builder:1.10 AS builder + +ENV GOPATH /go + +COPY . $GOPATH/src/go.etcd.io/etcd + +RUN yum install -y make && \ + cd $GOPATH/src/go.etcd.io/etcd && \ + make build + +# stage 2 +FROM openshift/origin-base + +ENTRYPOINT ["/usr/bin/etcd"] + +COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/ + +LABEL io.k8s.display-name="etcd server" \ + io.k8s.description="etcd is distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ + maintainer="Sam Batschelet "