From c70d84b94f6ee36745a267ce2790d4ea2b1f9e93 Mon Sep 17 00:00:00 2001 From: Sam Batschelet Date: Sat, 4 May 2019 11:49:48 -0400 Subject: [PATCH] Dockerfile: set coreos org as canonical for release-3.3 Signed-off-by: Sam Batschelet --- Dockerfile.openshift | 12 +++++------- Dockerfile.rhel | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 9dc11e3dd7c..36e10d51454 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,20 +1,18 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder -ENV GOPATH /go +WORKDIR /go/src/github.com/coreos/etcd -COPY . $GOPATH/src/go.etcd.io/etcd +COPY . . -RUN yum install -y git && \ - cd $GOPATH/src/go.etcd.io/etcd && \ - make build +RUN 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/ -COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/ +COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/ +COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/ LABEL io.k8s.display-name="etcd server" \ io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ diff --git a/Dockerfile.rhel b/Dockerfile.rhel index ae4b1468f8d..af3d9df97f8 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,20 +1,18 @@ FROM openshift/golang-builder:1.10 AS builder -ENV GOPATH /go +WORKDIR /go/src/github.com/coreos/etcd -COPY . $GOPATH/src/go.etcd.io/etcd +COPY . . -RUN yum install -y make && \ - cd $GOPATH/src/go.etcd.io/etcd && \ - make build +RUN 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/ -COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/ +COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/ +COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/ LABEL io.k8s.display-name="etcd server" \ io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \