diff --git a/.travis.yml b/.travis.yml index d460602d4ac..4239f533ab1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: - docker go: - - '1.12' + - '1.12.4' deploy: - provider: releases diff --git a/Dockerfile b/Dockerfile index 7d96dbdeb6a..652f5587eb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # To run ghostunnel from the image (for example): # docker run --rm squareup/ghostunnel --version -FROM golang:1.12-alpine as build +FROM golang:1.12.4-alpine as build MAINTAINER Cedric Staub "cs@squareup.com" diff --git a/Makefile.dist b/Makefile.dist index 01f5f9a0a42..d3855079fb7 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -2,7 +2,7 @@ MKFILE_PATH := $(lastword $(MAKEFILE_LIST)) CURRENT_DIR := $(patsubst %/,%,$(dir $(realpath $(MKFILE_PATH)))) -GO_VERSION ?= 1.12 +GO_VERSION ?= 1.12.4 XGO_BASE_IMAGE ?= cssx/xgo-${GO_VERSION} # Current system information diff --git a/README.md b/README.md index 21e4a5f3203..8a287c44fc3 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ To run tests: make test # Option 2: run unit & integration tests in a Docker container - GO_VERSION=1.12 make docker-test + GO_VERSION=1.12.4 make docker-test # Open coverage information in browser go tool cover -html coverage-merged.out