From 12c06870f3181f14989241e6eef2f47a901add6a Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Wed, 22 Mar 2017 12:29:18 -0700 Subject: [PATCH] update latest versions Signed-off-by: Jess Frazelle --- consul/Dockerfile | 3 +-- latest-versions.sh | 3 +++ oauth2-proxy/Dockerfile | 32 ++++++++++++++++++++++++++++++++ vagrant/Dockerfile | 2 +- vault/Dockerfile | 3 +-- vscode/Dockerfile | 4 ++-- watchman/Dockerfile | 4 +++- 7 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 oauth2-proxy/Dockerfile diff --git a/consul/Dockerfile b/consul/Dockerfile index c39ecfa..1dde899 100644 --- a/consul/Dockerfile +++ b/consul/Dockerfile @@ -6,8 +6,7 @@ ENV GOPATH /go #ENV GO15VENDOREXPERIMENT 1 RUN apk --no-cache add \ - ca-certificates \ - curl + ca-certificates ENV CONSUL_VERSION v0.7.5 diff --git a/latest-versions.sh b/latest-versions.sh index 6e125d8..59130ba 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -37,6 +37,8 @@ get_latest() { dir="golang-softhsm2" elif [[ "$dir" == "bazel" ]]; then dir="gitiles" + elif [[ "$dir" == "oauth2_proxy" ]]; then + dir="oauth2-proxy" fi local current=$(cat "${dir}/Dockerfile" | grep -m 1 VERSION | awk '{print $(NF)}') @@ -59,6 +61,7 @@ curl/curl opendnssec/SoftHSMv2 irssi/irssi zyedidia/micro +bitly/oauth2_proxy JonnyWong16/plexpy powershell/powershell ricochet-im/ricochet diff --git a/oauth2-proxy/Dockerfile b/oauth2-proxy/Dockerfile new file mode 100644 index 0000000..5965ece --- /dev/null +++ b/oauth2-proxy/Dockerfile @@ -0,0 +1,32 @@ +FROM alpine:latest +LABEL maintainer "Jessie Frazelle " + +ENV PATH /go/bin:/usr/local/go/bin:$PATH +ENV GOPATH /go + +RUN apk --no-cache add \ + ca-certificates + +ENV OAUTH2_VERSION v2.1 + +RUN buildDeps=' \ + go \ + git \ + gcc \ + g++ \ + libc-dev \ + libgcc \ + ' \ + set -x \ + && apk --no-cache add --repository https://dl-3.alpinelinux.org/alpine/edge/community $buildDeps \ + && go get github.com/bitly/oauth2_proxy \ + && cd /go/src/github.com/bitly/oauth2_proxy \ + && git checkout "${OAUTH2_VERSION}" \ + && go build \ + && mv oauth2_proxy /usr/bin/ \ + && apk del $buildDeps \ + && rm -rf /go \ + && echo "Build complete." + + +ENTRYPOINT [ "oauth2_proxy" ] diff --git a/vagrant/Dockerfile b/vagrant/Dockerfile index 29510c2..28280d9 100644 --- a/vagrant/Dockerfile +++ b/vagrant/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -ENV VAGRANT_VERSION 1.9.2 +ENV VAGRANT_VERSION 1.9.3 ADD https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb diff --git a/vault/Dockerfile b/vault/Dockerfile index 5104d54..3196aa8 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -5,8 +5,7 @@ ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go RUN apk --no-cache add \ - ca-certificates \ - curl + ca-certificates ENV VAULT_VERSION v0.6.5 diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5b646d7..c4d2ee8 100644 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,8 +51,8 @@ RUN useradd --create-home --home-dir $HOME user \ && chown -R user:user $HOME # https://code.visualstudio.com/Download -ENV CODE_VERSION 1.9.1-1486597190 -ENV CODE_COMMIT f9d0c687ff2ea7aabd85fb9a43129117c0ecf519 +ENV CODE_VERSION 1.10.2-1488981323 +ENV CODE_COMMIT 8076a19fdcab7e1fc1707952d652f0bb6c6db331 # download the source RUN buildDeps=' \ diff --git a/watchman/Dockerfile b/watchman/Dockerfile index a08153f..2b8a2e9 100644 --- a/watchman/Dockerfile +++ b/watchman/Dockerfile @@ -6,14 +6,16 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -ENV WATCHMAN_VERSION v4.7.0 +ENV WATCHMAN_VERSION v4.8.0-rc1 RUN buildDeps=' \ autoconf \ automake \ clang \ git \ + libtool \ make \ + pkg-config \ ' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \