update oauth2 proxy;

Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
This commit is contained in:
Jess Frazelle 2019-03-08 11:29:49 -05:00
parent 01feb50dde
commit 86e66cdc21
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
3 changed files with 26 additions and 18 deletions

View File

@ -125,7 +125,7 @@ mitmproxy/mitmproxy
hashicorp/nomad hashicorp/nomad
zeit/now-cli zeit/now-cli
nzbget/nzbget nzbget/nzbget
bitly/oauth2_proxy pusher/oauth2_proxy
facebook/osquery facebook/osquery
hashicorp/packer hashicorp/packer
Tautulli/Tautulli Tautulli/Tautulli

View File

@ -1,24 +1,32 @@
FROM golang:1.10-alpine as builder FROM golang:1.10 as builder
MAINTAINER Jessica Frazelle <jess@linux.com> MAINTAINER Jessica Frazelle <jess@linux.com>
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go ENV GOPATH /go
RUN apk add --no-cache \ RUN apt-get update && apt-get install -y \
bash \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN curl -sL https://deb.nodesource.com/setup_11.x | bash -
RUN apt-get update && apt-get install -y \
gcc \ gcc \
git \ git \
g++ \ g++ \
libgcc \
linux-headers \
make \ make \
musl-dev \ nodejs \
npm \
pkgconf \ pkgconf \
python2 \ python \
yarn \ yarn \
zip zip \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
ENV NOMAD_VERSION v0.9.0-beta3 ENV NOMAD_VERSION v0.9.0-beta3

View File

@ -8,15 +8,15 @@ RUN apk --no-cache add \
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go ENV GOPATH /go
ENV OAUTH2_PROXY_VERSION v2.2 ENV OAUTH2_PROXY_VERSION v3.1.0
RUN go get github.com/bitly/oauth2_proxy || true \ RUN go get github.com/golang/dep/cmd/dep
&& cd /go/src/github.com/bitly/oauth2_proxy \
&& git checkout "${OAUTH2_VERSION}" \ RUN go get github.com/pusher/oauth2_proxy || true \
&& go get -d github.com/bitly/oauth2_proxy || true \ && cd /go/src/github.com/pusher/oauth2_proxy \
&& go get gopkg.in/fsnotify/fsnotify.v1 \ && git checkout "${OAUTH2_PROXY_VERSION}" \
&& mv "${GOPATH}/src/gopkg.in/fsnotify/fsnotify.v1" "${GOPATH}/src/gopkg.in/fsnotify.v1" \ && dep ensure --vendor-only \
&& go build \ && go build . \
&& mv oauth2_proxy /usr/bin/ && mv oauth2_proxy /usr/bin/