From 0c5e1b8274bce0e968c231f995756c0f72429d33 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 14 Jun 2018 15:30:04 -0400 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- clean-registry/Dockerfile | 17 ++--------------- gcloud/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/clean-registry/Dockerfile b/clean-registry/Dockerfile index c18c8bc..c51f65d 100644 --- a/clean-registry/Dockerfile +++ b/clean-registry/Dockerfile @@ -1,33 +1,20 @@ -FROM alpine:latest +FROM jess/gcloud RUN apk add --no-cache \ ca-certificates \ bash \ - parallel \ - python + parallel # Install google cloud sdk # Download clean-registry script RUN set -x \ && apk add --no-cache --virtual .build-deps \ curl \ - tar \ - && curl -sSL -o /tmp/google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \ && curl -sSL -o /usr/bin/clean-registry https://raw.githubusercontent.com/jessfraz/dotfiles/master/bin/clean-registry \ && chmod +x /usr/bin/clean-registry \ - && mkdir -p /usr/src/google-cloud-sdk \ - && tar -xzf /tmp/google-cloud-sdk.tar.gz -C /usr/src/google-cloud-sdk --strip-components 1 \ - && rm /tmp/google-cloud-sdk.tar.gz \ - && ( \ - cd /usr/src/google-cloud-sdk \ - && ./install.sh \ - --usage-reporting false \ - --path-update true \ - ) \ && apk del .build-deps WORKDIR /root -ENV PATH $PATH:/usr/src/google-cloud-sdk/bin ENV GOPATH /go # Install reg diff --git a/gcloud/Dockerfile b/gcloud/Dockerfile index 2e03ada..4503add 100644 --- a/gcloud/Dockerfile +++ b/gcloud/Dockerfile @@ -5,7 +5,7 @@ RUN set -x \ curl \ ca-certificates \ tar \ - && curl -sSL -o /tmp/google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \ + && curl -sSL -o /tmp/google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz \ && mkdir -p /usr/src/google-cloud-sdk \ && tar -xzf /tmp/google-cloud-sdk.tar.gz -C /usr/src/google-cloud-sdk --strip-components 1 \ && rm /tmp/google-cloud-sdk.tar.gz \