Merge branch 'master' into go-mod

* master:
  Move docker dep commands to earlier in the build
This commit is contained in:
Henry Jenkins 2019-07-15 21:38:55 +01:00
commit bc81a0f6e4
5 changed files with 14 additions and 6 deletions

View File

@ -31,6 +31,7 @@
## Changes since v3.2.0 ## Changes since v3.2.0
- [#209](https://github.com/pusher/outh2_proxy/pull/209) Improve docker build caching of layers (@dekimsey)
- [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent (@JoelSpeed) - [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent (@JoelSpeed)
- [#187](https://github.com/pusher/oauth2_proxy/pull/187) Move root packages to pkg folder (@JoelSpeed) - [#187](https://github.com/pusher/oauth2_proxy/pull/187) Move root packages to pkg folder (@JoelSpeed)
- [#65](https://github.com/pusher/oauth2_proxy/pull/65) Improvements to authenticate requests with a JWT bearer token in the `Authorization` header via - [#65](https://github.com/pusher/oauth2_proxy/pull/65) Improvements to authenticate requests with a JWT bearer token in the `Authorization` header via

View File

@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
# Copy sources # Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
COPY . .
# Fetch dependencies # Fetch dependencies
COPY go.mod go.sum ./
RUN go mod download RUN go mod download
# Now pull in our code
COPY . .
# Build binary and make sure there is at least an empty key file. # Build binary and make sure there is at least an empty key file.
# This is useful for GCP App Engine custom runtime builds, because # This is useful for GCP App Engine custom runtime builds, because
# you cannot use multiline variables in their app.yaml, so you have to # you cannot use multiline variables in their app.yaml, so you have to

View File

@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
# Copy sources # Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
COPY . .
# Fetch dependencies # Fetch dependencies
COPY go.mod go.sum ./
RUN go mod download RUN go mod download
# Now pull in our code
COPY . .
# Build binary and make sure there is at least an empty key file. # Build binary and make sure there is at least an empty key file.
# This is useful for GCP App Engine custom runtime builds, because # This is useful for GCP App Engine custom runtime builds, because
# you cannot use multiline variables in their app.yaml, so you have to # you cannot use multiline variables in their app.yaml, so you have to

View File

@ -5,11 +5,14 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
# Copy sources # Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
COPY . .
# Fetch dependencies # Fetch dependencies
COPY go.mod go.sum ./
RUN go mod download RUN go mod download
# Now pull in our code
COPY . .
# Build binary and make sure there is at least an empty key file. # Build binary and make sure there is at least an empty key file.
# This is useful for GCP App Engine custom runtime builds, because # This is useful for GCP App Engine custom runtime builds, because
# you cannot use multiline variables in their app.yaml, so you have to # you cannot use multiline variables in their app.yaml, so you have to

4
configure vendored
View File

@ -112,9 +112,7 @@ check_go_env() {
cd ${0%/*} cd ${0%/*}
if [ ! -f .env ]; then rm -fv .env
rm .env
fi
check_for make check_for make
check_for awk check_for awk