From 471e6691547f4d5d35185578ef940ecc777f7855 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 19 Apr 2017 15:59:40 +0200 Subject: magnum-conductor: mark as x86-64 only "kubectl" used by image is x86-64 binary Change-Id: I5bd39a899e74acdebdbf467051d9c7bd53be4c6f Partially-Implements: blueprint multiarch-and-arm64-containers --- docker/magnum/magnum-conductor/Dockerfile.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 085b4fd17..032f7ef06 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -3,6 +3,13 @@ MAINTAINER {{ maintainer }} {% block magnum_conductor_header %}{% endblock %} +{% if base_arch != 'x86_64' %} + +RUN echo 'There is no "kubectl" binary for {{ base_arch }}' \ + && /bin/false + +{% endif %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} -- cgit v1.2.3