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

Merge pull request #1188 from vieux/switch_to_1.5 

switch to golang 1.5
This commit is contained in:
Alexandre Beslic 2015-09-02 11:46:58 -07:00
parent 2fb43773cf 16ac82a509
commit cfa802c07f
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.4 - 1.5
# 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.4 FROM golang:1.5
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

@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& 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.4.2 ENV GO_VERSION 1.5
RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \ RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \
&& mkdir -p /go/bin && mkdir -p /go/bin
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH