diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-10 09:44:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-10 09:44:36 +0000 |
| commit | d0b4896436379375bdc59da4da4a90fc3fe461a1 (patch) | |
| tree | 0ac3c0697fd1a5a90af68673608163b09d8a8971 /docker/kube | |
| parent | 76bc0f69cc801a5e5796f1a8a70c13d6355bd6c8 (diff) | |
| parent | e614be9ce5c0d9602d357cd7e9f21b1587c2ff38 (diff) | |
| download | kolla-d0b4896436379375bdc59da4da4a90fc3fe461a1.tar.gz kolla-d0b4896436379375bdc59da4da4a90fc3fe461a1.zip | |
Merge "kubernetes: disable for architectures other than x86-64"
Diffstat (limited to 'docker/kube')
| -rw-r--r-- | docker/kube/kube-base/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index 00af4ada9..0e4da1c10 100644 --- a/docker/kube/kube-base/Dockerfile.j2 +++ b/docker/kube/kube-base/Dockerfile.j2 @@ -3,6 +3,13 @@ MAINTAINER {{ maintainer }} ENV KUBERNETES_VERSION=v1.5.4 +{% if base_arch != 'x86_64' %} + +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/amd64 {% block kube_base_header %}{% endblock %} |