Browse code

Merge pull request #6520 from unclejack/bump_go_to_1.3

bump Go to 1.3

Michael Crosby authored on 2014/07/29 03:06:43
Showing 3 changed files
... ...
@@ -4,7 +4,7 @@
4 4
 language: go
5 5
 
6 6
 # This should match the version in the Dockerfile.
7
-go: 1.2.1
7
+go: 1.3
8 8
 
9 9
 # Let us have pretty experimental Docker-based Travis workers.
10 10
 # (These spin up much faster than the VM-based ones.)
... ...
@@ -60,7 +60,7 @@ RUN	cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper
60 60
 # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
61 61
 
62 62
 # Install Go
63
-RUN	curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
63
+RUN	curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz
64 64
 ENV	PATH	/usr/local/go/bin:$PATH
65 65
 ENV	GOPATH	/go:/go/src/github.com/docker/docker/vendor
66 66
 RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1
... ...
@@ -45,7 +45,7 @@ need to package Docker your way, without denaturing it in the process.
45 45
 To build Docker, you will need the following:
46 46
 
47 47
 * A recent version of git and mercurial
48
-* Go version 1.2 or later
48
+* Go version 1.3 or later
49 49
 * A clean checkout of the source added to a valid [Go
50 50
   workspace](http://golang.org/doc/code.html#Workspaces) under the path
51 51
   *src/github.com/docker/docker* (unless you plan to use `AUTO_GOPATH`,