From c037cb06e93ddb5dae4c100d8f612112e6489c9c Mon Sep 17 00:00:00 2001 From: Shota SAWADA Date: Sat, 26 Jan 2019 19:28:36 +0900 Subject: [PATCH 1/3] docker: Bump base docker image versions Signed-off-by: Shota SAWADA --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37dd15fb6be..1243d6c524b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11.4-alpine +FROM golang:1.11.5-alpine ARG git_tag ARG git_commit diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 6f45fe90232..29b4fd8b767 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM golang:1.11.4-alpine +FROM golang:1.11.5-alpine ARG git_tag ARG git_commit From 52266fc7d4197751b67afb732e21c44904e062b5 Mon Sep 17 00:00:00 2001 From: Shota SAWADA Date: Sat, 26 Jan 2019 19:37:55 +0900 Subject: [PATCH 2/3] vendor: Bump golang.org/x/crypto Signed-off-by: Shota SAWADA --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 031f3da8044..7c7d2705e01 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/urfave/negroni v1.0.0 github.com/ziutek/mymysql v1.5.4 // indirect go.uber.org/atomic v1.3.2 // indirect - golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc + golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b golang.org/x/net v0.0.0-20181029044818-c44066c5c816 // indirect golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect diff --git a/go.sum b/go.sum index 416e5070a3c..8425f03b41b 100644 --- a/go.sum +++ b/go.sum @@ -278,6 +278,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc h1:F5tKCVGp+MUAHhKp5MZtGqAlGX3+oCsiL1Q629FL90M= golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b h1:Elez2XeF2p9uyVj0yEUDqQ56NFcDtcBNkYP7yv8YbUE= +golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180611182652-db08ff08e862 h1:JZi6BqOZ+iSgmLWe6llhGrNnEnK+YB/MRkStwnEfbqM= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 313f37e3532a7e505a243851229352130de3761c Mon Sep 17 00:00:00 2001 From: Shota SAWADA Date: Sat, 26 Jan 2019 21:19:31 +0900 Subject: [PATCH 3/3] ci: Point where to install gometalinter expressly for breaking chnaging at gometalinter installer https://github.com/alecthomas/gometalinter/commit/83891259ab664a6d96066685f7f07431375ca8e5#diff-80423f13d45b53af35790ffc6009be4d Signed-off-by: Shota SAWADA --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8610eff9e4..6eec526f711 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: | echo 'export GO111MODULE=on' >> $BASH_ENV source $BASH_ENV - - run: curl -L https://git.io/vp6lP | sh + - run: curl -L https://git.io/vp6lP | sh -s -- -b ./bin - run: mv ./bin/* $GOPATH/bin - run: go mod download - run: go mod vendor