From fd3897d0c366b65e798be5a5e51a0c0ec937542b Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 8 Feb 2018 01:03:22 -0800 Subject: [PATCH] Move to go1.9.4 with recent security release (#5502) --- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.dev | 2 +- buildscripts/checkdeps.sh | 2 +- main.go | 4 ++-- main_test.go | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22aa86c7e..e4f32828a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,4 @@ after_success: - bash <(curl -s https://codecov.io/bash) go: -- 1.9.1 +- 1.9.4 diff --git a/Dockerfile b/Dockerfile index e1cf38088..c84566167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine3.6 +FROM golang:1.9.4-alpine3.6 MAINTAINER Minio Inc diff --git a/Dockerfile.dev b/Dockerfile.dev index 0229cfd5a..2eb4df13b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.9.2-alpine3.6 +FROM golang:1.9.4-alpine3.6 MAINTAINER Minio Inc diff --git a/buildscripts/checkdeps.sh b/buildscripts/checkdeps.sh index 2794ede8a..fdd46a07c 100644 --- a/buildscripts/checkdeps.sh +++ b/buildscripts/checkdeps.sh @@ -21,7 +21,7 @@ _init() { ## Minimum required versions for build dependencies GIT_VERSION="1.0" - GO_VERSION="1.9.1" + GO_VERSION="1.9.4" OSX_VERSION="10.8" KNAME=$(uname -s) ARCH=$(uname -m) diff --git a/main.go b/main.go index 3503e60da..96f183942 100644 --- a/main.go +++ b/main.go @@ -36,8 +36,8 @@ import ( ) const ( - // Minio requires at least Go v1.9.1 - minGoVersion = "1.9.1" + // Minio requires at least Go v1.9.4 + minGoVersion = "1.9.4" goVersionConstraint = ">= " + minGoVersion ) diff --git a/main_test.go b/main_test.go index b91d21010..5a24bdc40 100644 --- a/main_test.go +++ b/main_test.go @@ -28,9 +28,9 @@ func TestCheckGoVersion(t *testing.T) { expectedErr error }{ {minGoVersion, nil}, - {"1.6.8", fmt.Errorf("Minio is not compiled by Go >= 1.9.1. Please recompile accordingly")}, - {"1.5", fmt.Errorf("Minio is not compiled by Go >= 1.9.1. Please recompile accordingly")}, - {"0.1", fmt.Errorf("Minio is not compiled by Go >= 1.9.1. Please recompile accordingly")}, + {"1.6.8", fmt.Errorf("Minio is not compiled by Go >= 1.9.4. Please recompile accordingly")}, + {"1.5", fmt.Errorf("Minio is not compiled by Go >= 1.9.4. Please recompile accordingly")}, + {"0.1", fmt.Errorf("Minio is not compiled by Go >= 1.9.4. Please recompile accordingly")}, {".1", fmt.Errorf("Malformed version: .1")}, {"somejunk", fmt.Errorf("Malformed version: somejunk")}, }