diff --git a/.travis.yml b/.travis.yml index d25d0b3962..d822cecc3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: go # This should match the version in the Dockerfile. -go: 1.2.1 +go: 1.3 # Let us have pretty experimental Docker-based Travis workers. # (These spin up much faster than the VM-based ones.) diff --git a/Dockerfile b/Dockerfile index 5369962359..97d3fdd62b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,7 @@ RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL # Install Go -RUN curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz +RUN curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz ENV PATH /usr/local/go/bin:$PATH ENV GOPATH /go:/go/src/github.com/docker/docker/vendor RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 diff --git a/hack/PACKAGERS.md b/hack/PACKAGERS.md index 6a22f4fc97..687b554414 100644 --- a/hack/PACKAGERS.md +++ b/hack/PACKAGERS.md @@ -45,7 +45,7 @@ need to package Docker your way, without denaturing it in the process. To build Docker, you will need the following: * A recent version of git and mercurial -* Go version 1.2 or later +* Go version 1.3 or later * A clean checkout of the source added to a valid [Go workspace](http://golang.org/doc/code.html#Workspaces) under the path *src/github.com/docker/docker* (unless you plan to use `AUTO_GOPATH`,