Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5771 from gyuho/docker

Browse Source 
*: separate Dockerfile for quay build trigger
This commit is contained in:
Gyu-Ho Lee 2016-06-24 13:26:05 -07:00 committed by GitHub
commit 40f62ab4a5
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -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
Dockerfile-release Normal file
View File

@ -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"]

2
scripts/build-docker
View File

@ -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}