... | ... |
@@ -36,7 +36,7 @@ run apt-get install -y -q mercurial |
36 | 36 |
run apt-get install -y -q build-essential libsqlite3-dev |
37 | 37 |
|
38 | 38 |
# Install Go |
39 |
-run curl -s https://go.googlecode.com/files/go1.2rc5.src.tar.gz | tar -v -C /usr/local -xz |
|
39 |
+run curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz |
|
40 | 40 |
env PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin |
41 | 41 |
env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor |
42 | 42 |
run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std |
... | ... |
@@ -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.2rc1 or later (see notes below regarding using Go 1.1.2 and dynbinary) |
|
39 |
+* Go version 1.2 or later (see notes below regarding using Go 1.1.2 and dynbinary) |
|
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,8 @@ 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 not yet officially |
|
95 |
-released at the time of this writing), please use: |
|
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: |
|
96 | 96 |
|
97 | 97 |
```bash |
98 | 98 |
./hack/make.sh dynbinary |