Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri… #2013

Merged
merged 14 commits into from
Mar 5, 2023
Merged

Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri… #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6f0bb86
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 12, 2023
6e4e2fa
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 12, 2023
a061cd5
Fixes CVE-2022-41721 (#1994)
jeroenlandheer Feb 13, 2023
fd50a35
update checkout actions (#1981)
ryuichi1208 Feb 13, 2023
2faa91e
Fix a typo in oauthproxy.go (#2021)
HoKim98 Feb 20, 2023
f204625
fix typo (#2001)
trel Feb 20, 2023
280b8e4
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 12, 2023
ce4a31e
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 12, 2023
8f3b9c2
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 26, 2023
bdc1127
Merge remote-tracking branch 'origin/feature/Oauth2-proxy_v7_4_0_is_n…
Feb 26, 2023
72e8762
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 26, 2023
902f610
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 26, 2023
1daaeef
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 26, 2023
087cd85
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri…
Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: go

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -54,4 +54,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ N/A
- `-bitbucket-team` Restrict authorization to users that are part of this Bitbucket team
- [#211](https://github.com/oauth2-proxy/oauth2-proxy/pull/211) Switch from dep to go modules (@steakunderscore)
- [#145](https://github.com/oauth2-proxy/oauth2-proxy/pull/145) Add support for OIDC UserInfo endpoint email verification (@rtluckie)
- [#2013](https://github.com/oauth2-proxy/oauth2-proxy/pull/2013) Upgrade alpine to version 3.17.2 and library dependencies (@miguelborges99)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, this was in the wrong place, will need to move that up to the top


# v3.2.0

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This ARG has to be at the top, otherwise the docker daemon does not known what to do with FROM ${RUNTIME_IMAGE}
ARG RUNTIME_IMAGE=alpine:3.16
ARG RUNTIME_IMAGE=alpine:3.17.2

# All builds should be done using the platform native to the build node to allow
# cache sharing of the go mod download step.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $(BINARY):
CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7

DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/ppc64le,linux/arm/v6,linux/arm/v8
DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.15
DOCKER_BUILD_RUNTIME_IMAGE ?= alpine:3.17.2
DOCKER_BUILDX_ARGS ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE}
DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --build-arg VERSION=${VERSION}
DOCKER_BUILDX_X_PLATFORM := $(DOCKER_BUILDX) --platform ${DOCKER_BUILD_PLATFORM}
Expand Down
23 changes: 12 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ require (
github.com/alicebob/miniredis/v2 v2.23.0
github.com/benbjohnson/clock v1.3.0
github.com/bitly/go-simplejson v0.5.0
github.com/bsm/redislock v0.8.1
github.com/coreos/go-oidc/v3 v3.4.0
github.com/bsm/redislock v0.9.0
github.com/coreos/go-oidc/v3 v3.5.0
github.com/fsnotify/fsnotify v1.6.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-redis/redis/v9 v9.0.0-rc.1
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
Expand All @@ -21,18 +20,19 @@ require (
github.com/oauth2-proxy/mockoidc v0.0.0-20220221072942-e3afe97dec43
github.com/oauth2-proxy/tools/reference-gen v0.0.0-20210118095127-56ffd7384404
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.21.1
github.com/onsi/gomega v1.23.0
github.com/pierrec/lz4/v4 v4.1.17
github.com/prometheus/client_golang v1.13.0
github.com/redis/go-redis/v9 v9.0.2
github.com/spf13/cast v1.5.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.6.3
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.1
github.com/vmihailenco/msgpack/v5 v5.3.5
golang.org/x/crypto v0.1.0
golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20221019170559-20944726eadf
golang.org/x/net v0.1.0
golang.org/x/oauth2 v0.1.0
golang.org/x/net v0.6.0
golang.org/x/oauth2 v0.5.0
golang.org/x/sync v0.1.0
google.golang.org/api v0.100.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
Expand All @@ -45,9 +45,10 @@ require (
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand All @@ -69,8 +70,8 @@ require (
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a // indirect
google.golang.org/grpc v1.50.1 // indirect
Expand Down
Loading