From 86e66cdc211b909dcfdd73ebb2762b7f7349fdb0 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@jessfraz.com>
Date: Fri, 8 Mar 2019 11:29:49 -0500
Subject: [PATCH] update oauth2 proxy;

Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
---
 latest-versions.sh      |  2 +-
 nomad/Dockerfile        | 26 +++++++++++++++++---------
 oauth2-proxy/Dockerfile | 16 ++++++++--------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/latest-versions.sh b/latest-versions.sh
index 9de13eb..e39df32 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -125,7 +125,7 @@ mitmproxy/mitmproxy
 hashicorp/nomad
 zeit/now-cli
 nzbget/nzbget
-bitly/oauth2_proxy
+pusher/oauth2_proxy
 facebook/osquery
 hashicorp/packer
 Tautulli/Tautulli
diff --git a/nomad/Dockerfile b/nomad/Dockerfile
index 2089de5..9c6c73f 100644
--- a/nomad/Dockerfile
+++ b/nomad/Dockerfile
@@ -1,24 +1,32 @@
-FROM golang:1.10-alpine as builder
+FROM golang:1.10 as builder
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-RUN	apk add --no-cache \
-	bash \
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
 	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 \
 	git \
 	g++ \
-	libgcc \
-	linux-headers \
 	make \
-	musl-dev \
-	npm \
+	nodejs \
 	pkgconf \
-	python2 \
+	python \
 	yarn \
-	zip
+	zip \
+    --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV NOMAD_VERSION v0.9.0-beta3
 
diff --git a/oauth2-proxy/Dockerfile b/oauth2-proxy/Dockerfile
index 6e9da33..6944da7 100644
--- a/oauth2-proxy/Dockerfile
+++ b/oauth2-proxy/Dockerfile
@@ -8,15 +8,15 @@ RUN	apk --no-cache add \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 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 \
-	&& cd /go/src/github.com/bitly/oauth2_proxy \
-	&& git checkout "${OAUTH2_VERSION}" \
-	&& go get -d github.com/bitly/oauth2_proxy || true \
-	&& go get gopkg.in/fsnotify/fsnotify.v1 \
-	&& mv "${GOPATH}/src/gopkg.in/fsnotify/fsnotify.v1" "${GOPATH}/src/gopkg.in/fsnotify.v1" \
-	&& go build \
+RUN go get github.com/golang/dep/cmd/dep
+
+RUN go get github.com/pusher/oauth2_proxy || true \
+	&& cd /go/src/github.com/pusher/oauth2_proxy \
+	&& git checkout "${OAUTH2_PROXY_VERSION}" \
+	&& dep ensure --vendor-only \
+	&& go build . \
 	&& mv oauth2_proxy /usr/bin/