Merge pull request #13 from seemethere/update_golang

Merged with https://github.com/seemethere/unir
seemethere · Apr 2, 2018 · fc2a7e1 · fc2a7e1
2 parents ffa65b7 + 847dcd1
commit fc2a7e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 language: go
 go:
+    - 1.10.x
     - 1.9.x
     - master
 matrix:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2-alpine as build
+FROM golang:1.10.1-alpine as build
 
 RUN apk --update add make
 

diff --git a/docker.Makefile b/docker.Makefile
@@ -1,4 +1,4 @@
-GOLANG_IMAGE=golang:1.9
+GOLANG_IMAGE=golang:1.10.1
 WORKDIR=/go/src/github.com/seemethere/unir
 DOCKER_RUN=docker run --rm -i -v "$(CURDIR)":$(WORKDIR) -w $(WORKDIR)