Skip to content

Commit

Permalink
bump Go to 1.3
Browse files Browse the repository at this point in the history
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack)
  • Loading branch information
unclejack committed Jul 26, 2014
1 parent 487a417 commit d0a0e91
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
language: go

# This should match the version in the Dockerfile.
go: 1.2.1
go: 1.3

# Let us have pretty experimental Docker-based Travis workers.
# (These spin up much faster than the VM-based ones.)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL

# Install Go
RUN curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
RUN curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz
ENV PATH /usr/local/go/bin:$PATH
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
Expand Down
2 changes: 1 addition & 1 deletion hack/PACKAGERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ need to package Docker your way, without denaturing it in the process.
To build Docker, you will need the following:

* A recent version of git and mercurial
* Go version 1.2 or later
* Go version 1.3 or later
* A clean checkout of the source added to a valid [Go
workspace](http://golang.org/doc/code.html#Workspaces) under the path
*src/github.com/docker/docker* (unless you plan to use `AUTO_GOPATH`,
Expand Down

0 comments on commit d0a0e91

Please sign in to comment.