From 611ecad7e3d7ce7b14274412b684094553dcb4da Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 9 Aug 2013 16:08:11 -0700 Subject: [PATCH] Upgrade Dockerfile with new dependency Upstream-commit: bdbac9f7a1dd31bd5d78f50eb9fa3b3793d1d13b Component: engine --- components/engine/Dockerfile | 3 ++- components/engine/VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 1905f056a8..34e23b14df 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -7,6 +7,7 @@ run echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt run apt-get update run apt-get install -y -q curl run apt-get install -y -q git +run apt-get install -y -q mercurial # Install Go run curl -s https://go.googlecode.com/files/go1.1.1.linux-amd64.tar.gz | tar -v -C /usr/local -xz env PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin @@ -28,7 +29,7 @@ run PKG=github.com/gorilla/mux/ REV=9b36453141c; git clone http://$PKG /go/src/ run PKG=github.com/dotcloud/tar/ REV=d06045a6d9; git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV # Docker requires code.google.com/p/go.net/websocket run apt-get install -y -q mercurial -run PKG=code.google.com/p/go.net REV=78ad7f42aa2e; hg clone https://$PKG /go/src/$PKG && cd /go/src/$PKG && hg checkout -r $REV +run PKG=code.google.com/p/go.net/ REV=84a4013f96e0; hg clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && hg checkout $REV # Upload docker source add . /go/src/github.com/dotcloud/docker # Build the binary diff --git a/components/engine/VERSION b/components/engine/VERSION index 53978e5317..12805ec824 100644 --- a/components/engine/VERSION +++ b/components/engine/VERSION @@ -1 +1 @@ -0.5.1-dev +0.5.2-dev