From 528da23d6a5e0b6f37c1241c982bb49f301632cc Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 2 May 2013 15:27:37 +0300 Subject: [PATCH] use Go 1.0.3 to build docker --- hack/dockerbuilder/Dockerfile | 6 +++++- hack/dockerbuilder/dockerbuilder | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hack/dockerbuilder/Dockerfile b/hack/dockerbuilder/Dockerfile index 55540984fd..af8dce108c 100644 --- a/hack/dockerbuilder/Dockerfile +++ b/hack/dockerbuilder/Dockerfile @@ -4,8 +4,12 @@ maintainer Solomon Hykes from ubuntu:12.10 run apt-get update run DEBIAN_FRONTEND=noninteractive apt-get install -y -q s3cmd +run DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl # Packages required to checkout and build docker -run DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang +run curl -s -o /go.tar.gz https://go.googlecode.com/files/go1.0.3.linux-amd64.tar.gz +run tar -C /usr/local -xzf /go.tar.gz +run echo "export PATH=$PATH:/usr/local/go/bin" > /.bashrc +run echo "export PATH=$PATH:/usr/local/go/bin" > /.bash_profile run DEBIAN_FRONTEND=noninteractive apt-get install -y -q git run DEBIAN_FRONTEND=noninteractive apt-get install -y -q build-essential # Packages required to build an ubuntu package diff --git a/hack/dockerbuilder/dockerbuilder b/hack/dockerbuilder/dockerbuilder index 5e803aa0b2..500a82db9f 100644 --- a/hack/dockerbuilder/dockerbuilder +++ b/hack/dockerbuilder/dockerbuilder @@ -2,6 +2,8 @@ set -x set -e +export PATH=$PATH:/usr/local/go/bin + PACKAGE=github.com/dotcloud/docker if [ $# -gt 1 ]; then