From 90289b8502c155b8c383177846a7763a2bb593ed Mon Sep 17 00:00:00 2001 From: ERIK Date: Mon, 30 May 2022 03:32:51 +0800 Subject: [PATCH] add arch var in dockerfile (#8875) Signed-off-by: bo.jiang --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c33b63387..81f12880c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # Use imutable image tags rather than mutable tags (like ubuntu:20.04) FROM ubuntu:focal-20220316 +ARG ARCH=amd64 ARG TZ=Etc/UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -11,7 +12,7 @@ RUN apt update -y \ && rm -rf /var/lib/apt/lists/* RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + "deb [arch=$ARCH] https://download.docker.com/linux/ubuntu \ $(lsb_release -cs) \ stable" \ && apt update -y && apt-get install --no-install-recommends -y docker-ce \ @@ -31,6 +32,6 @@ RUN /usr/bin/python3 -m pip install --no-cache-dir pip -U \ && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 RUN KUBE_VERSION=$(sed -n 's/^kube_version: //p' roles/kubespray-defaults/defaults/main.yaml) \ - && curl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/amd64/kubectl \ + && curl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/$ARCH/kubectl \ && chmod a+x kubectl \ && mv kubectl /usr/local/bin/kubectl