Update Go versions

Signed-off-by: Sebastiaan van Stijn <[email protected]>
fakhruddin-roomi · May 7, 2019 · 1438768 · 1438768
1 parent b5050d6
commit 1438768
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: go
 
 go:
-  - 1.7.1
+  - "1.11.x"
+  - "1.12.x"
 
 # let us have speedy Docker-based Travis workers
 sudo: false

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,9 +23,9 @@ If you don't already have `git` installed, you should install it.  For example,
 sudo apt-get install git
 ```
 
-You also need Go 1.7 or higher.  Download Go from [https://golang.org/dl/](https://golang.org/dl/).  To install on Linux:
+Download Go from [https://golang.org/dl/](https://golang.org/dl/).  To install on Linux:
 ```sh
-tar xzvf go1.7.1.linux-amd64.tar.gz
+tar xzvf go1.12.4.linux-amd64.tar.gz
 sudo mv go /usr/local
 ```
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.7.1-alpine
+ARG GO_VERSION=1.12.4
+
+FROM golang:${GO_VERSION}-alpine
 
 ARG GOOS
 ARG GOARCH

diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile
@@ -1,3 +1,5 @@
+ARG GO_VERSION=1.12.4
+
 # Dockerfile for swarm integration test environment.
 # Use with run_in_docker.sh
 
@@ -8,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git file parall
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-ENV GO_VERSION 1.7.1
+ENV GO_VERSION=${GO_VERSION}
 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 GOPATH /go