Switch kubernetes-helm to use curl to aquire latest kubectl

Chuxel · Chuxel · commit 7aabfd75db19 · 2019-06-13T15:48:23.000-07:00
#79
diff --git a/containers/kubernetes-helm/.devcontainer/Dockerfile b/containers/kubernetes-helm/.devcontainer/Dockerfile
@@ -26,10 +26,8 @@ RUN apt-get update \
     && apt-get install -y docker-ce-cli \
     #
     # Install kubectl
-    && curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
-    && echo "deb https://apt.kubernetes.io/ kubernetes-$(lsb_release -cs) main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
-    && apt-get update \
-    && apt-get install -y kubectl \
+    && curl -sSLO -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
+    && chmod +x /usr/local/bin/kubectl \
     #
     # Install Helm
     && curl -s https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash - \

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,8 @@ RUN apt-get update \`
`26`	`26`	`&& apt-get install -y docker-ce-cli \`
`27`	`27`	`#`
`28`	`28`	`# Install kubectl`
`29`		`- && curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg \| (OUT=$(apt-key add - 2>&1) \|\| echo $OUT) \`
`30`		`- && echo "deb https://apt.kubernetes.io/ kubernetes-$(lsb_release -cs) main" \| tee -a /etc/apt/sources.list.d/kubernetes.list \`
`31`		`- && apt-get update \`
`32`		`- && apt-get install -y kubectl \`
	`29`	`+ && curl -sSLO -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \`
	`30`	`+ && chmod +x /usr/local/bin/kubectl \`
`33`	`31`	`#`
`34`	`32`	`# Install Helm`
`35`	`33`	`&& curl -s https://raw.githubusercontent.com/helm/helm/master/scripts/get \| bash - \`