diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-15 17:08:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-15 17:08:59 +0000 |
| commit | 819557fdd09d82aa9d4f535b9a962f6548a2bbae (patch) | |
| tree | e458e84f16ad8ee8923b23aa6b7feb0acf27281e /docker/kubetoolbox | |
| parent | c72c001e7f45f9416b13d64c7d6833ff8ea86647 (diff) | |
| parent | 43de60caaf7cc592b6397c844ef35b2f66e8dd4b (diff) | |
| download | kolla-819557fdd09d82aa9d4f535b9a962f6548a2bbae.tar.gz kolla-819557fdd09d82aa9d4f535b9a962f6548a2bbae.zip | |
Merge "introduce 'install_kubectl' macro"
Diffstat (limited to 'docker/kubetoolbox')
| -rw-r--r-- | docker/kubetoolbox/Dockerfile.j2 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 6cd8f6dc3..34f7695a9 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -3,13 +3,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block kubetoolbox_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 %} {% set kubetoolbox_packages = [ @@ -21,8 +14,7 @@ RUN echo 'There is no "kubectl" binary for {{ base_arch }}' \ {{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }} {% block kubetoolbox_install_kube_binary %} -RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/release/v1.4.0/bin/linux/amd64/kubectl \ - && chmod 755 /usr/bin/kubectl + {{ macros.install_kubectl() }} {% endblock %} {% block kubetoolbox_footer %}{% endblock %} |
