From ab679adcbfaa251b2de00daa0acdbb7771a8ae04 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 9 Jan 2019 16:42:17 +0100 Subject: debian/ubuntu: introduce 'debian_arch' variable Many images have 'if x86_64 then amd64 elif aarch64 then arm64' check to comply with Debian like architecture names in several projects. This patch creates 'debian_arch' variable which can be used in all Docker files (similar to 'base_arch' one). All required images got converted to use it. Change-Id: I9c5e6f13d6c9b24fe323408512bd5aef290111ad --- docker/kube/kube-base/Dockerfile.j2 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'docker/kube') diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index d0dc32fa3..02449df2e 100644 --- a/docker/kube/kube-base/Dockerfile.j2 +++ b/docker/kube/kube-base/Dockerfile.j2 @@ -3,16 +3,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ENV KUBERNETES_VERSION=v1.11.1 -{% if base_arch == 'x86_64' %} -ENV KUBE_ARCH=amd64 -{% elif base_arch == 'aarch64' %} -ENV KUBE_ARCH=arm64 -{% else %} -RUN echo 'Kubernetes images not yet available for {{ base_arch }}' \ -&& /bin/false -{% endif %} - -ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/${KUBE_ARCH} +ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/{{debian_arch}} {% block kube_base_header %}{% endblock %} -- cgit v1.2.3