Skip to content

Commit 99b0320

Browse files
Copilotchefgs
andauthored
Support arch-aware kubectl downloads
Agent-Logs-Url: https://github.com/cloudengine-labs/devops_os/sessions/8929bee2-ec5e-454a-8614-f771484942ab Co-authored-by: chefgs <7605658+chefgs@users.noreply.github.com>
1 parent 97d9e04 commit 99b0320

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ARG PYTHON_VERSION=3.11
66
ARG JAVA_VERSION=17
77
ARG NODE_VERSION=20
88
ARG GO_VERSION=1.21
9+
ARG TARGETOS=linux
10+
ARG TARGETARCH=amd64
911
ARG INSTALL_PYTHON=true
1012
ARG INSTALL_JAVA=true
1113
ARG INSTALL_JS=true
@@ -124,9 +126,9 @@ RUN if [ "$INSTALL_TERRAFORM" = "true" ]; then \
124126
# Install kubectl if requested
125127
RUN if [ "$INSTALL_KUBECTL" = "true" ]; then \
126128
KUBECTL_VERSION="$(curl -fsSL https://dl.k8s.io/release/stable.txt)" \
127-
&& curl -fsSLo /tmp/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
128-
&& curl -fsSLo /tmp/kubectl.sha256 "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256" \
129-
&& (test "$(cat /tmp/kubectl.sha256)" = "$(sha256sum /tmp/kubectl | cut -d' ' -f1)" || (echo "kubectl checksum verification failed" && exit 1)) \
129+
&& curl -fsSLo /tmp/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl" \
130+
&& curl -fsSLo /tmp/kubectl.sha256 "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl.sha256" \
131+
&& (test "$(cat /tmp/kubectl.sha256)" = "$(sha256sum /tmp/kubectl | cut -d' ' -f1)" || (echo "kubectl checksum verification failed" >&2 && exit 1)) \
130132
&& install -o root -g root -m 0755 /tmp/kubectl /usr/local/bin/kubectl \
131133
&& rm -f /tmp/kubectl /tmp/kubectl.sha256; \
132134
fi

0 commit comments

Comments
 (0)