Browse code

Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)

Tianon Gravi authored on 2013/12/17 15:57:54
Showing 2 changed files
... ...
@@ -36,7 +36,7 @@ To build docker, you will need the following system dependencies
36 36
 
37 37
 * An amd64 machine
38 38
 * A recent version of git and mercurial
39
-* Go version 1.2 or later (see notes below regarding using Go 1.1.2 and dynbinary)
39
+* Go version 1.2 or later
40 40
 * SQLite version 3.7.9 or later
41 41
 * A clean checkout of the source must be added to a valid Go [workspace](http://golang.org/doc/code.html#Workspaces)
42 42
 under the path *src/github.com/dotcloud/docker*.
... ...
@@ -91,8 +91,7 @@ You would do the users of your distro a disservice and "void the docker warranty
91 91
 A good comparison is Busybox: all distros package it as a statically linked binary, because it just
92 92
 makes sense. Docker is the same way.
93 93
 
94
-If you *must* have a non-static Docker binary, or require Go 1.1.2 (since Go 1.2 is still freshly released
95
-at the time of this writing), please use:
94
+If you *must* have a non-static Docker binary, please use:
96 95
 
97 96
 ```bash
98 97
 ./hack/make.sh dynbinary
... ...
@@ -136,7 +136,7 @@ sudo('echo -e "deb http://archive.ubuntu.com/ubuntu raring main universe\n'
136 136
 sudo('DEBIAN_FRONTEND=noninteractive apt-get install -q -y wget python-dev'
137 137
     ' python-pip supervisor git mercurial linux-image-extra-$(uname -r)'
138 138
     ' aufs-tools make libfontconfig libevent-dev libsqlite3-dev libssl-dev')
139
-sudo('wget -O - https://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz | '
139
+sudo('wget -O - https://go.googlecode.com/files/go1.2.linux-amd64.tar.gz | '
140 140
     'tar -v -C /usr/local -xz; ln -s /usr/local/go/bin/go /usr/bin/go')
141 141
 sudo('GOPATH=/go go get -d github.com/dotcloud/docker')
142 142
 sudo('pip install -r {}/requirements.txt'.format(CFG_PATH))