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

Merge pull request #1342 from vieux/update_to_1.5.1 

switch to go1.5.1
This commit is contained in:
Alexandre Beslic 2015-10-28 11:47:11 -07:00
parent 86816e7d44 b924f7f8fa
commit e8dd274b65
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,7 +1,7 @@
language: go language: go
go: go:
- 1.5 - 1.5.1
# let us have speedy Docker-based Travis workers # let us have speedy Docker-based Travis workers
sudo: false sudo: false

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.5 FROM golang:1.5.1
COPY . /go/src/github.com/docker/swarm COPY . /go/src/github.com/docker/swarm
WORKDIR /go/src/github.com/docker/swarm WORKDIR /go/src/github.com/docker/swarm

2
test/integration/Dockerfile
View File

@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git file \
&& apt-get clean && rm -rf /var/lib/apt/lists/* && apt-get clean && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
ENV GO_VERSION 1.5 ENV GO_VERSION 1.5.1
RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local -xz RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local -xz
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go ENV GOPATH /go