diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f59bb7..6efe4cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.2 + +* Switch to Debian Stretch base image. +* Upgrade `oauth2_proxy` to v2.2. + ## 2.1-2 * Fix 500 Internal Error Internal Error when sending POST to Google diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..c907cbc --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @itskingori @tsu-shiuan @zacblazic diff --git a/Dockerfile b/Dockerfile index 973ae36..ac36e74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,21 @@ -FROM alpine:3.4 +FROM debian:stretch-slim -ENV APP_PKGS="ca-certificates" -ENV BUILD_PKGS="wget" +ARG OAUTH2_PROXY_VERSION="2.2" +ARG OAUTH2_PROXY_GOLANG_VERSION="1.8.1" +ARG OAUTH2_PROXY_PKG_VERSION="2.2.0" +ARG OAUTH2_PROXY_PKG="oauth2_proxy-${OAUTH2_PROXY_PKG_VERSION}.linux-amd64.go${OAUTH2_PROXY_GOLANG_VERSION}" +ARG OAUTH2_PROXY_SHA="1c16698ed0c85aa47aeb80e608f723835d9d1a8b98bd9ae36a514826b3acce56" -ENV OAUTH2_PROXY_VERSION="2.1" -ENV OAUTH2_PROXY_PKG="oauth2_proxy-${OAUTH2_PROXY_VERSION}.linux-amd64.go1.6" \ - OAUTH2_PROXY_SHA="3061e5b04bd14eeb9ec0ad1c9b324ba8d99d50eaadc5f528cdf4d21043828298" -RUN apk update && \ - apk upgrade && \ - apk add $APP_PKGS $BUILD_PKGS && \ +RUN apt-get update -y && \ + apt-get install --no-install-recommends -y \ + ca-certificates wget && \ mkdir -p /var/tmp/oauth2_proxy && \ cd /var/tmp/oauth2_proxy && \ wget --progress=dot:mega https://github.com/bitly/oauth2_proxy/releases/download/v${OAUTH2_PROXY_VERSION}/${OAUTH2_PROXY_PKG}.tar.gz && \ echo "${OAUTH2_PROXY_SHA} *${OAUTH2_PROXY_PKG}.tar.gz" | sha256sum -c - && \ tar xvf ${OAUTH2_PROXY_PKG}.tar.gz && \ cp /var/tmp/oauth2_proxy/${OAUTH2_PROXY_PKG}/oauth2_proxy /bin/ && \ - apk del $BUILD_PKGS && \ - rm -rf /var/cache/apk/* + rm -rf /tmp/* /var/{cache,log,tmp} /var/lib/{apt,dpkg,cache,log} EXPOSE 4180