diff --git a/.travis.yml b/.travis.yml index 8b39182a..60e56015 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go go: - - 1.14.x + - 1.15.x env: - COVER=true install: diff --git a/CHANGELOG.md b/CHANGELOG.md index e49f3e64..e25171c2 100644 --- 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 diff --git a/Dockerfile b/Dockerfile index a989cb73..310eec1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-buster AS builder +FROM golang:1.15-buster AS builder ARG VERSION # Download tools diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 642770fe..4f7433f9 100644 --- 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 diff --git a/Dockerfile.armv6 b/Dockerfile.armv6 index 2d16e3e2..a69cf318 100644 --- 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 diff --git a/go.mod b/go.mod index 7e4d28bf..2b3ec136 100644 --- 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