Update to Go 1.2 officially, now that it is released
This commit is contained in:
parent
d8ee08ba7b
commit
5c5f670901
2 changed files with 4 additions and 4 deletions
|
@ -36,7 +36,7 @@ run apt-get install -y -q mercurial
|
|||
run apt-get install -y -q build-essential libsqlite3-dev
|
||||
|
||||
# Install Go
|
||||
run curl -s https://go.googlecode.com/files/go1.2rc5.src.tar.gz | tar -v -C /usr/local -xz
|
||||
run curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz
|
||||
env PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
|
||||
env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
|
||||
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
|
|||
|
||||
* An amd64 machine
|
||||
* A recent version of git and mercurial
|
||||
* Go version 1.2rc1 or later (see notes below regarding using Go 1.1.2 and dynbinary)
|
||||
* Go version 1.2 or later (see notes below regarding using Go 1.1.2 and dynbinary)
|
||||
* SQLite version 3.7.9 or later
|
||||
* A clean checkout of the source must be added to a valid Go [workspace](http://golang.org/doc/code.html#Workspaces)
|
||||
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
|
|||
A good comparison is Busybox: all distros package it as a statically linked binary, because it just
|
||||
makes sense. Docker is the same way.
|
||||
|
||||
If you *must* have a non-static Docker binary, or require Go 1.1.2 (since Go 1.2 is not yet officially
|
||||
released at the time of this writing), please use:
|
||||
If you *must* have a non-static Docker binary, or require Go 1.1.2 (since Go 1.2 is still freshly released
|
||||
at the time of this writing), please use:
|
||||
|
||||
```bash
|
||||
./hack/make.sh dynbinary
|
||||
|
|
Loading…
Reference in a new issue