Upgrade to 1.16

openflagr · Jul 3, 2021 · 1b4e241 · 1b4e241
1 parent d7418a6
commit 1b4e241
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 15,405 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   unit_test:
     docker:
-      - image: golang:1.15
+      - image: golang:1.16
     working_directory: /go/src/github.com/checkr/flagr
     steps:
       - checkout

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN make build_ui
 ######################################
 # Prepare go_builder
 ######################################
-FROM golang:1.15 as go_builder
+FROM golang:1.16 as go_builder
 WORKDIR /go/src/github.com/checkr/flagr
 ADD . .
 RUN make build

diff --git a/Makefile b/Makefile
@@ -44,9 +44,8 @@ start:
 gen: api_docs swagger
 
 deps:
-	@GO111MODULE=off go get -u github.com/myitcv/gobin
-	@gobin github.com/go-swagger/go-swagger/cmd/[email protected]
-	@gobin github.com/golangci/golangci-lint/cmd/[email protected]
+	@go install github.com/go-swagger/go-swagger/cmd/[email protected]
+	@go install github.com/golangci/golangci-lint/cmd/[email protected]
 
 serve_docs:
 	@npm install -g docsify-cli@4

diff --git a/browser/flagr-ui/package-lock.json b/browser/flagr-ui/package-lock.json
diff --git a/docs/home.md b/docs/home.md
@@ -34,7 +34,7 @@ docker run -it -p 18000:18000 checkr/flagr
 
 Install Dependencies.
 
-- Go
+- Go (1.16+)
 - Make (for Makefile)
 - NPM (for building UI)
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/checkr/flagr
 
-go 1.15
+go 1.16
 
 require (
 	cloud.google.com/go v0.37.4

diff --git a/go.sum b/go.sum
@@ -71,7 +71,6 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/evalphobia/logrus_sentry v0.4.6 h1:825MLGu+SW5H8hMXGeBI7TwX7vgJLd9hz0Eth1Mnp3o=
 github.com/evalphobia/logrus_sentry v0.4.6/go.mod h1:pKcp+vriitUqu9KiWj/VRFbRfFNUwz95/UkgG8a6MNc=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03 h1:G/9fPivTr5EiyqE9OlW65iMRUxFXMGRHgZFGo50uG8Q=
 github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=

diff --git a/integration_tests/Dockerfile-Integration-Test b/integration_tests/Dockerfile-Integration-Test
@@ -1,7 +1,7 @@
 ######################################
 # Prepare go_builder
 ######################################
-FROM golang:1.15 as go_builder
+FROM golang:1.16 as go_builder
 WORKDIR /go/src/github.com/checkr/flagr
 ADD . .
 RUN make build