-
Notifications
You must be signed in to change notification settings - Fork 327
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into pr/rhansen/310
- Loading branch information
Showing
6 changed files
with
727 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# voucher/vouch-proxy | ||
# https://github.com/vouch/vouch-proxy | ||
FROM golang:1.14 AS builder | ||
FROM golang:1.15 AS builder | ||
|
||
LABEL maintainer="[email protected]" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# voucher/vouch-proxy | ||
# https://github.com/vouch/vouch-proxy | ||
FROM golang:1.14 AS builder | ||
FROM golang:1.15 AS builder | ||
|
||
LABEL maintainer="[email protected]" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
module github.com/vouch/vouch-proxy | ||
|
||
go 1.15 | ||
|
||
require ( | ||
cloud.google.com/go v0.77.0 // indirect | ||
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect | ||
github.com/dgrijalva/jwt-go v3.2.0+incompatible | ||
github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect | ||
github.com/fsnotify/fsnotify v1.4.9 // indirect | ||
github.com/google/go-cmp v0.5.4 | ||
github.com/gorilla/mux v1.8.0 | ||
github.com/gorilla/sessions v1.2.1 | ||
github.com/influxdata/tdigest v0.0.1 // indirect | ||
github.com/karupanerura/go-mock-http-response v0.0.0-20171201120521-7c242a447d45 | ||
github.com/kelseyhightower/envconfig v1.4.0 | ||
github.com/magiconair/properties v1.8.4 // indirect | ||
github.com/mailru/easyjson v0.7.7 // indirect | ||
github.com/mitchellh/mapstructure v1.4.1 | ||
github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da | ||
github.com/patrickmn/go-cache v2.1.0+incompatible | ||
github.com/pelletier/go-toml v1.8.1 // indirect | ||
github.com/spf13/afero v1.5.1 // indirect | ||
github.com/spf13/cast v1.3.1 // indirect | ||
github.com/spf13/jwalterweatherman v1.1.0 // indirect | ||
github.com/spf13/pflag v1.0.5 // indirect | ||
github.com/spf13/viper v1.7.1 | ||
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect | ||
github.com/stretchr/testify v1.5.1 | ||
github.com/theckman/go-securerandom v0.1.1 | ||
github.com/tsenart/vegeta v12.7.0+incompatible | ||
go.uber.org/multierr v1.6.0 // indirect | ||
go.uber.org/zap v1.16.0 | ||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 | ||
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99 | ||
golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b // indirect | ||
gopkg.in/ini.v1 v1.62.0 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
) |
Oops, something went wrong.