git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge branch 'master' into go-mod
bc81a0fHenry Jenkins
CHANGELOG.md+1
compare with master
unifiedsplit
@@ -31,6 +31,7 @@
31
31
32## Changes since v3.2.0
32## Changes since v3.2.0
33
33
34+- [#209](https://github.com/pusher/outh2_proxy/pull/209) Improve docker build caching of layers (@dekimsey)
34- [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent (@JoelSpeed)
35- [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent (@JoelSpeed)
35- [#187](https://github.com/pusher/oauth2_proxy/pull/187) Move root packages to pkg folder (@JoelSpeed)
36- [#187](https://github.com/pusher/oauth2_proxy/pull/187) Move root packages to pkg folder (@JoelSpeed)
36- [#65](https://github.com/pusher/oauth2_proxy/pull/65) Improvements to authenticate requests with a JWT bearer token in the `Authorization` header via
37- [#65](https://github.com/pusher/oauth2_proxy/pull/65) Improvements to authenticate requests with a JWT bearer token in the `Authorization` header via
Dockerfile+4−1
@@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
5
5
6# Copy sources
6# Copy sources
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
9
8
10# Fetch dependencies
9# Fetch dependencies
10+COPY go.mod go.sum ./
11RUN go mod download
11RUN go mod download
12
12
13+# Now pull in our code
14+COPY . .
15+
13# Build binary and make sure there is at least an empty key file.
16# Build binary and make sure there is at least an empty key file.
14# This is useful for GCP App Engine custom runtime builds, because
17# This is useful for GCP App Engine custom runtime builds, because
15# you cannot use multiline variables in their app.yaml, so you have to
18# you cannot use multiline variables in their app.yaml, so you have to
Dockerfile.arm64+4−1
@@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
5
5
6# Copy sources
6# Copy sources
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
9
8
10# Fetch dependencies
9# Fetch dependencies
10+COPY go.mod go.sum ./
11RUN go mod download
11RUN go mod download
12
12
13+# Now pull in our code
14+COPY . .
15+
13# Build binary and make sure there is at least an empty key file.
16# Build binary and make sure there is at least an empty key file.
14# This is useful for GCP App Engine custom runtime builds, because
17# This is useful for GCP App Engine custom runtime builds, because
15# you cannot use multiline variables in their app.yaml, so you have to
18# you cannot use multiline variables in their app.yaml, so you have to
Dockerfile.armv6+4−1
@@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
5
5
6# Copy sources
6# Copy sources
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
7WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
9
8
10# Fetch dependencies
9# Fetch dependencies
10+COPY go.mod go.sum ./
11RUN go mod download
11RUN go mod download
12
12
13+# Now pull in our code
14+COPY . .
15+
13# Build binary and make sure there is at least an empty key file.
16# Build binary and make sure there is at least an empty key file.
14# This is useful for GCP App Engine custom runtime builds, because
17# This is useful for GCP App Engine custom runtime builds, because
15# you cannot use multiline variables in their app.yaml, so you have to
18# you cannot use multiline variables in their app.yaml, so you have to
configure+1−3
@@ -112,9 +112,7 @@ check_go_env() {
112
112
113cd ${0%/*}
113cd ${0%/*}
114
114
115−if [ ! -f .env ]; then
116− rm .env
115+rm -fv .env
117−fi
118
116
119check_for make
117check_for make
120check_for awk
118check_for awk