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/macros.j2 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'docker/macros.j2') diff --git a/docker/macros.j2 b/docker/macros.j2 index 111572140..171d9564c 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -75,21 +75,11 @@ RUN apt-get update \ {% endmacro %} {% macro install_kubectl() %} - {% if base_arch == 'x86_64' %} - ENV KUBE_ARCH=amd64 - {% elif base_arch == 'aarch64' %} - ENV KUBE_ARCH=arm64 - {% else %} - RUN echo 'There is no "kubectl" binary for {{ base_arch }}' \ - && /bin/false - {% endif %} - # TODO(mandre) check for file integrity instead of downloading from an HTTPS source - RUN curl -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/${KUBE_ARCH}/kubectl \ + RUN curl -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/{{debian_arch}}/kubectl \ && chmod 755 /usr/bin/kubectl {% endmacro %} - {% macro install_fluent_plugins(plugins) -%} {% if plugins is defined and plugins|length > 0 -%} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} -- cgit v1.2.3