From b3a80707c1f8fd73c5e3ae99f3f600a20dd5f365 Mon Sep 17 00:00:00 2001 From: zhuojie Date: Wed, 16 Sep 2020 14:24:06 -0700 Subject: [PATCH] Bump to go1.15 --- .circleci/config.yml | 2 +- Dockerfile | 2 +- go.mod | 2 +- integration_tests/Dockerfile-Integration-Test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d647278d..3724d0f2 100644 --- 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 index 898e6abf..0fce88d4 100644 --- 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 index 17b44faf..9776bf9e 100644 --- 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 index 29f28b51..0fbd8b15 100644 --- 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