diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 11:45:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 11:45:34 +0000 |
| commit | a34a7a01a6050f2e0890023df308ca06a815cefe (patch) | |
| tree | 3686c9738374de16829dd4d77db520c00939feeb | |
| parent | 27b1dada01adc75e78549012e8d89fe12a637d6d (diff) | |
| parent | 471e6691547f4d5d35185578ef940ecc777f7855 (diff) | |
| download | kolla-a34a7a01a6050f2e0890023df308ca06a815cefe.tar.gz kolla-a34a7a01a6050f2e0890023df308ca06a815cefe.zip | |
Merge "magnum-conductor: mark as x86-64 only"
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
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' %} |