Merge branch 'master' into go-mod
* master:
Move docker dep commands to earlier in the build
commitbc81a0f6e46b23b5e1bb38548e1b1436101a7334
authorHenry Jenkins <henry@henryjenkins.name>
dateMon 15 Jul 2019, 21:38 (7 years ago)
parent56f5141e952ab4
CHANGELOG.md+1
@@ -31,6 +31,7 @@
3131
3232## Changes since v3.2.0
3333
34+- [#209](https://github.com/pusher/outh2_proxy/pull/209) Improve docker build caching of layers (@dekimsey)
3435- [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent (@JoelSpeed)
3536- [#187](https://github.com/pusher/oauth2_proxy/pull/187) Move root packages to pkg folder (@JoelSpeed)
3637- [#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
55
66# Copy sources
77WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
98
109# Fetch dependencies
10+COPY go.mod go.sum ./
1111RUN go mod download
1212
13+# Now pull in our code
14+COPY . .
15+
1316# Build binary and make sure there is at least an empty key file.
1417# This is useful for GCP App Engine custom runtime builds, because
1518# 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
55
66# Copy sources
77WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
98
109# Fetch dependencies
10+COPY go.mod go.sum ./
1111RUN go mod download
1212
13+# Now pull in our code
14+COPY . .
15+
1316# Build binary and make sure there is at least an empty key file.
1417# This is useful for GCP App Engine custom runtime builds, because
1518# 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
55
66# Copy sources
77WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
8−COPY . .
98
109# Fetch dependencies
10+COPY go.mod go.sum ./
1111RUN go mod download
1212
13+# Now pull in our code
14+COPY . .
15+
1316# Build binary and make sure there is at least an empty key file.
1417# This is useful for GCP App Engine custom runtime builds, because
1518# you cannot use multiline variables in their app.yaml, so you have to
configure+1−3
@@ -112,9 +112,7 @@ check_go_env() {
112112
113113cd ${0%/*}
114114
115−if [ ! -f .env ]; then
116− rm .env
117−fi
115+rm -fv .env
118116
119117check_for make
120118check_for awk