Skip to content

Switch to debian & upgrade to 2.2 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 28, 2018
+16 −11
Merged

Switch to debian & upgrade to 2.2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
074c0c3
Update base image to debian strech
zacblazic Sep 28, 2018
065470a
Extract golang version into argument
zacblazic Sep 28, 2018
e571b7f
Move arguments further down the dockerfile
zacblazic Sep 28, 2018
9fbc7a1
Upgrade to oauth2 proxy version 2.2
zacblazic Sep 28, 2018
ae94d1f
Bump version and update CHANGELOG
zacblazic Sep 28, 2018
a0352f5
Add CODEOWNERS file
zacblazic Sep 28, 2018
1dddf42
Cleanup /var/tmp
zacblazic Sep 28, 2018
0f71fa5
Use a single RUN command in dockerfile
zacblazic Sep 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @itskingori @tsu-shiuan @zacblazic
21 changes: 10 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down