Skip to content

Commit

Permalink
chore: update Dockerfile bin deps (GoogleContainerTools#8774)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-prindle committed May 12, 2023
1 parent 3dc1cf0 commit 3dbea61
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 23 deletions.
11 changes: 5 additions & 6 deletions deploy/skaffold/Dockerfile.deps
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ ARG ARCH=amd64
# Download kubectl
FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.24.12
ENV KUBECTL_VERSION v1.27.1
ENV KUBECTL_URL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl
# SHAs at gs://kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha512 .
Expand All @@ -30,7 +29,7 @@ RUN chmod +x kubectl
FROM alpine:3.10 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.10.2
ENV HELM_VERSION v3.12.0
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
Expand All @@ -39,7 +38,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
# Download kustomize
FROM alpine:3.10 as download-kustomize
ARG ARCH
ENV KUSTOMIZE_VERSION 4.4.0
ENV KUSTOMIZE_VERSION 5.0.3
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
Expand All @@ -48,7 +47,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.24
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
Expand Down Expand Up @@ -93,7 +92,7 @@ RUN chmod +x k3d
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 424.0.0
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
# SHAs listed at https://cloud.google.com/sdk/docs/downloads-versioned-archives
COPY deploy/skaffold/digests/gcloud.${ARCH}.sha256 .
Expand Down
11 changes: 5 additions & 6 deletions deploy/skaffold/Dockerfile.deps.lts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ ARG ARCH=amd64
# Download kubectl
FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.24.12
ENV KUBECTL_VERSION v1.27.1
ENV KUBECTL_URL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl
# SHAs at gs://kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha512 .
Expand All @@ -30,7 +29,7 @@ RUN chmod +x kubectl
FROM alpine:3.10 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.10.2
ENV HELM_VERSION v3.12.0
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
Expand All @@ -39,7 +38,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
# Download kustomize
FROM alpine:3.10 as download-kustomize
ARG ARCH
ENV KUSTOMIZE_VERSION 4.4.0
ENV KUSTOMIZE_VERSION 5.0.3
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
Expand All @@ -48,7 +47,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.24
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
Expand All @@ -57,7 +56,7 @@ RUN chmod +x kpt
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 424.0.0
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
# SHAs listed at https://cloud.google.com/sdk/docs/downloads-versioned-archives
COPY deploy/skaffold/digests/gcloud.${ARCH}.sha256 .
Expand Down
11 changes: 5 additions & 6 deletions deploy/skaffold/Dockerfile.deps.slim
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ ARG ARCH=amd64

# Download kubectl
FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.24.12
ENV KUBECTL_VERSION v1.27.1
ENV KUBECTL_URL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl
# SHAs at gs://kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha512 .
Expand All @@ -30,7 +29,7 @@ RUN chmod +x kubectl
FROM alpine:3.10 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.10.2
ENV HELM_VERSION v3.12.0
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
Expand All @@ -39,7 +38,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
# Download kustomize
FROM alpine:3.10 as download-kustomize
ARG ARCH
ENV KUSTOMIZE_VERSION 4.4.0
ENV KUSTOMIZE_VERSION 5.0.3
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
Expand All @@ -48,7 +47,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.24
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
Expand All @@ -57,7 +56,7 @@ RUN chmod +x kpt
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 424.0.0
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
# SHAs listed at https://cloud.google.com/sdk/docs/downloads-versioned-archives
COPY deploy/skaffold/digests/gcloud.${ARCH}.sha256 .
Expand Down
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/gcloud.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1fed39626f23352e0f97623d5009ff1bb6c4ffd3875c85f4205f309292696b18 gcloud.tar.gz
a10844ec4e5af0e9f8c814ab765018bd40006c43e23b9f98cb25388848facea6 gcloud.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/helm.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2315941a13291c277dac9f65e75ead56386440d3907e0540bf157ae70f188347 helm.tar.gz
da36e117d6dbc57c8ec5bab2283222fbd108db86c83389eebe045ad1ef3e2c3b helm.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kpt.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
315547defaef2430f9bb71f60fd55a54a8f7055ae017ee72fc26e7773b1f634e kpt
227a6a4fdb391c53b74516a25964d61f63e5aa4e1fa19920fcc76603dc752871 kpt
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kubectl.amd64.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c71573ab0a10162af8adae67c4ebbbb0e3196a6ee1f193bb5f0676954772820ac84a22c2826ed15c16675b94e4009007cff417df31527479144abd19613b2948 kubectl
45c837500fd821553a76dfec626cbbe44ac9c5c2c82984e8cd1073615ed4707e69b0f6bd7adf001e0ddbcc89ccc7bca38162e7ee778473d59a09c91f3d99f7c2 kubectl
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kustomize.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bf3a0d7409d9ce6a4a393ba61289047b4cb875a36ece1ec94b36924a9ccbaa0f kustomize.tar.gz
c627b1575c3fecbc7ad1c181c23a7adcacf19732dab627eb57e89a7bc4c1e929 kustomize.tar.gz

0 comments on commit 3dbea61

Please sign in to comment.