Merge pull request #783 from johejo/go_115

Update Go to 1.15
2020-10-02 18:42:04 +01:00 · 2020-10-02 18:42:04 +01:00 · 9bc618bb08
parent 3fa42edb73 e64322b070
commit 9bc618bb08
6 changed files with 6 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.14.x
+  - 1.15.x
 env:
  - COVER=true
 install:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -29,6 +29,7 @@
 - [#764](https://github.com/oauth2-proxy/oauth2-proxy/pull/764) Document bcrypt encryption for htpasswd (and hide SHA) (@lentzi90)
 - [#616](https://github.com/oauth2-proxy/oauth2-proxy/pull/616) Add support to ensure user belongs in required groups when using the OIDC provider (@stefansedich)
 - [#800](https://github.com/oauth2-proxy/oauth2-proxy/pull/800) Fix import path for v7 (@johejo)
 - [#783](https://github.com/oauth2-proxy/oauth2-proxy/pull/783) Update Go to 1.15 (@johejo)
 # v6.1.1
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM golang:1.14-buster AS builder
+FROM golang:1.15-buster AS builder
 ARG VERSION
 # Download tools
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@ -1,4 +1,4 @@
-FROM golang:1.14-buster AS builder
+FROM golang:1.15-buster AS builder
 ARG VERSION
 # Download tools
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@ -1,4 +1,4 @@
-FROM golang:1.14-buster AS builder
+FROM golang:1.15-buster AS builder
 ARG VERSION
 # Download tools
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/oauth2-proxy/oauth2-proxy/v7
-go 1.14
+go 1.15
 require (
 	github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb