docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)

This commit is contained in:
Tianon Gravi 2013-12-16 23:57:54 -07:00
parent 124da338fd
commit 5e9b4a23e6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/PACKAGERS.md
View File

@ -36,7 +36,7 @@ To build docker, you will need the following system dependencies
* An amd64 machine * An amd64 machine
* A recent version of git and mercurial * A recent version of git and mercurial
* Go version 1.2 or later (see notes below regarding using Go 1.1.2 and dynbinary) * Go version 1.2 or later
* SQLite version 3.7.9 or later * 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) * 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*. 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
A good comparison is Busybox: all distros package it as a statically linked binary, because it just A good comparison is Busybox: all distros package it as a statically linked binary, because it just
makes sense. Docker is the same way. 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 still freshly released If you *must* have a non-static Docker binary, please use:
at the time of this writing), please use:
```bash ```bash
./hack/make.sh dynbinary ./hack/make.sh dynbinary

2
hack/infrastructure/docker-ci/deployment.py
View File

@ -136,7 +136,7 @@ sudo('echo -e "deb http://archive.ubuntu.com/ubuntu raring main universe\n'
sudo('DEBIAN_FRONTEND=noninteractive apt-get install -q -y wget python-dev' sudo('DEBIAN_FRONTEND=noninteractive apt-get install -q -y wget python-dev'
' python-pip supervisor git mercurial linux-image-extra-$(uname -r)' ' python-pip supervisor git mercurial linux-image-extra-$(uname -r)'
' aufs-tools make libfontconfig libevent-dev libsqlite3-dev libssl-dev') ' aufs-tools make libfontconfig libevent-dev libsqlite3-dev libssl-dev')
sudo('wget -O - https://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz | ' sudo('wget -O - https://go.googlecode.com/files/go1.2.linux-amd64.tar.gz | '
'tar -v -C /usr/local -xz; ln -s /usr/local/go/bin/go /usr/bin/go') 'tar -v -C /usr/local -xz; ln -s /usr/local/go/bin/go /usr/bin/go')
sudo('GOPATH=/go go get -d github.com/dotcloud/docker') sudo('GOPATH=/go go get -d github.com/dotcloud/docker')
sudo('pip install -r {}/requirements.txt'.format(CFG_PATH)) sudo('pip install -r {}/requirements.txt'.format(CFG_PATH))