Merge pull request #404 from checkr/zz/bump-go-version

Bump to go1.15
openflagr · Sep 16, 2020 · 011e7cc · 011e7cc
2 parents e6d7908 + b3a8070
commit 011e7cc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   unit_test:
     docker:
-      - image: golang:1.14
+      - image: golang:1.15
     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.14 as go_builder
+FROM golang:1.15 as go_builder
 WORKDIR /go/src/github.com/checkr/flagr
 ADD . .
 RUN make build

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

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