Pārlūkot izejas kodu

*: separate Dockerfile for quay build trigger

Fix https://quay.io/repository/coreos/etcd-git/build/d75d80b1-7d8d-42bd-af07-645b7da3a118.
Gyu-Ho Lee 9 gadi atpakaļ
vecāks
revīzija
8a71f749d7
3 mainītis faili ar 16 papildinājumiem un 10 dzēšanām
  1. 5 9
      Dockerfile
  2. 10 0
      Dockerfile-release
  3. 1 1
      scripts/build-docker

+ 5 - 9
Dockerfile

@@ -1,10 +1,6 @@
-FROM alpine:latest
-
-ADD bin/etcd /usr/local/bin/
-ADD bin/etcdctl /usr/local/bin/
-RUN mkdir -p /var/etcd/
-
+FROM golang
+ADD . /go/src/github.com/coreos/etcd
+ADD cmd/vendor /go/src/github.com/coreos/etcd/vendor
+RUN go install github.com/coreos/etcd
 EXPOSE 2379 2380
-
-# Define default command.
-CMD ["/usr/local/bin/etcd"]
+ENTRYPOINT ["etcd"]

+ 10 - 0
Dockerfile-release

@@ -0,0 +1,10 @@
+FROM alpine:latest
+
+ADD bin/etcd /usr/local/bin/
+ADD bin/etcdctl /usr/local/bin/
+RUN mkdir -p /var/etcd/
+
+EXPOSE 2379 2380
+
+# Define default command.
+CMD ["/usr/local/bin/etcd"]

+ 1 - 1
scripts/build-docker

@@ -8,6 +8,6 @@ IMAGEDIR=${BUILDDIR}/image-docker
 mkdir -p ${IMAGEDIR}
 cp ${BINARYDIR}/etcd ${BINARYDIR}/etcdctl ${IMAGEDIR}
 
-cat ./Dockerfile > ${IMAGEDIR}/Dockerfile
+cat ./Dockerfile-release > ${IMAGEDIR}/Dockerfile
 
 docker build -t quay.io/coreos/etcd:${1} ${IMAGEDIR}