Skip to content

Commit 836fbc2

Browse files
chore: update skaffold Dockerfiles to pull from approved GCS buckets vs open internet (#7921)
1 parent 56e5b8a commit 836fbc2

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

deploy/skaffold/Dockerfile.deps

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ FROM alpine:3.10 as download-helm
3131
ARG ARCH
3232
RUN echo arch=$ARCH
3333
ENV HELM_VERSION v3.9.2
34-
ENV HELM_URL https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
34+
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
3535
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
3636
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
3737
RUN tar -xvf helm.tar.gz --strip-components 1
@@ -40,7 +40,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
4040
FROM alpine:3.10 as download-kustomize
4141
ARG ARCH
4242
ENV KUSTOMIZE_VERSION 4.4.0
43-
ENV KUSTOMIZE_URL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
43+
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
4444
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
4545
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
4646
RUN tar -xvf kustomize.tar.gz
@@ -49,7 +49,7 @@ RUN tar -xvf kustomize.tar.gz
4949
FROM alpine:3.10 as download-kpt
5050
ARG ARCH
5151
ENV KPT_VERSION 0.39.3
52-
ENV KPT_URL https://github.com/GoogleContainerTools/kpt/releases/download/v${KPT_VERSION}/kpt_linux_amd64
52+
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
5353
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
5454
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
5555
RUN chmod +x kpt
@@ -58,7 +58,7 @@ RUN chmod +x kpt
5858
FROM alpine:3.10 as download-kompose
5959
ARG ARCH
6060
ENV KOMPOSE_VERSION v1.26.0
61-
ENV KOMPOSE_URL https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-linux-amd64
61+
ENV KOMPOSE_URL https://storage.googleapis.com/skaffold/deps/kompose/${KOMPOSE_VERSION}/kompose-linux-amd64
6262
COPY deploy/skaffold/digests/kompose.${ARCH}.sha256 .
6363
RUN wget -O kompose "${KOMPOSE_URL}" && sha256sum -c kompose.${ARCH}.sha256
6464
RUN chmod +x kompose
@@ -76,7 +76,7 @@ RUN chmod +x container-structure-test
7676
FROM alpine:3.10 as download-kind
7777
ARG ARCH
7878
ENV KIND_VERSION v0.11.1
79-
ENV KIND_URL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-${ARCH}
79+
ENV KIND_URL https://storage.googleapis.com/skaffold/deps/kind/${KIND_VERSION}/kind-linux-${ARCH}
8080
COPY deploy/skaffold/digests/kind.${ARCH}.sha512 .
8181
RUN wget -O kind "${KIND_URL}" && sha512sum -c kind.${ARCH}.sha512
8282
RUN chmod +x kind
@@ -85,7 +85,7 @@ RUN chmod +x kind
8585
FROM alpine:3.10 as download-k3d
8686
ARG ARCH
8787
ENV K3D_VERSION v5.0.3
88-
ENV K3D_URL https://github.com/rancher/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64
88+
ENV K3D_URL https://storage.googleapis.com/skaffold/deps/k3d/${K3D_VERSION}/k3d-linux-amd64
8989
COPY deploy/skaffold/digests/k3d.${ARCH}.sha256 .
9090
RUN wget -O k3d "${K3D_URL}" && sha256sum -c k3d.${ARCH}.sha256
9191
RUN chmod +x k3d
@@ -107,7 +107,7 @@ RUN tar -zxf gcloud.tar.gz
107107
FROM alpine:3.10 as download-bazel
108108
ARG ARCH
109109
ENV BAZEL_VERSION 4.2.1
110-
ENV BAZEL_URL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-BAZELARCH
110+
ENV BAZEL_URL https://storage.googleapis.com/skaffold/deps/bazel/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-BAZELARCH
111111
COPY deploy/skaffold/digests/bazel.${ARCH}.sha256 .
112112
RUN \
113113
BAZELARCH=$(case "${ARCH}" in amd64) echo x86_64;; *) echo ${ARCH};; esac); \

deploy/skaffold/Dockerfile.deps.lts

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ FROM alpine:3.10 as download-helm
3131
ARG ARCH
3232
RUN echo arch=$ARCH
3333
ENV HELM_VERSION v3.9.2
34-
ENV HELM_URL https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
34+
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
3535
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
3636
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
3737
RUN tar -xvf helm.tar.gz --strip-components 1
@@ -40,7 +40,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
4040
FROM alpine:3.10 as download-kustomize
4141
ARG ARCH
4242
ENV KUSTOMIZE_VERSION 4.4.0
43-
ENV KUSTOMIZE_URL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
43+
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
4444
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
4545
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
4646
RUN tar -xvf kustomize.tar.gz
@@ -49,7 +49,7 @@ RUN tar -xvf kustomize.tar.gz
4949
FROM alpine:3.10 as download-kpt
5050
ARG ARCH
5151
ENV KPT_VERSION 0.39.3
52-
ENV KPT_URL https://github.com/GoogleContainerTools/kpt/releases/download/v${KPT_VERSION}/kpt_linux_amd64
52+
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
5353
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
5454
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
5555
RUN chmod +x kpt

0 commit comments

Comments
 (0)