Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #474 from jpetazzo/switch-to-go-1.2

Browse Source 
Download and build Go 1.2 in the Dockerfile.
This commit is contained in:
Brandon Philips 2014-01-14 21:54:14 -08:00
commit 89074ffcea
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -1,9 +1,10 @@
FROM ubuntu:12.04
RUN apt-get update
RUN apt-get install -y python-software-properties git
RUN add-apt-repository -y ppa:duh/golang
RUN apt-get update
RUN apt-get install -y golang
# Let's install go just like Docker (from source).
RUN apt-get update -q
RUN apt-get install -qy build-essential curl git
RUN curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
ENV PATH /usr/local/go/bin:$PATH
ADD . /opt/etcd
RUN cd /opt/etcd && ./build
EXPOSE 4001 7001

2
README.md
View File

@ -49,7 +49,7 @@ cd etcd
This will generate a binary in the base directory called `./etcd`.
_NOTE_: you need go 1.1+. Please check your installation with
_NOTE_: you need go 1.2+. Please check your installation with
```
go version

4
go_version.go
View File

@ -1,3 +1,3 @@
// +build !go1.1
// +build !go1.2
"etcd requires go 1.1 or greater to build"
"etcd requires go 1.2 or greater to build"