diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-24 16:09:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-24 16:09:34 +0000 |
| commit | 5de9e8edf8fbc616ad96b597d4fd2c50fa24f20d (patch) | |
| tree | 3cf70ea4d7e0ce9e86b152102977d924a79da267 | |
| parent | 4bd72db9d06e414d3f2009497a94b76bfdb1e37d (diff) | |
| parent | 8dd0f553a25afc312e5ea73caf287dc0f71842c9 (diff) | |
| download | kolla-5de9e8edf8fbc616ad96b597d4fd2c50fa24f20d.tar.gz kolla-5de9e8edf8fbc616ad96b597d4fd2c50fa24f20d.zip | |
Merge "Allow customisation of k8s binary locations"
| -rw-r--r-- | docker/kubernetes-entrypoint/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kubetoolbox/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/kubernetes-entrypoint/Dockerfile.j2 b/docker/kubernetes-entrypoint/Dockerfile.j2 index fcda3694d..d303cf0da 100644 --- a/docker/kubernetes-entrypoint/Dockerfile.j2 +++ b/docker/kubernetes-entrypoint/Dockerfile.j2 @@ -3,8 +3,10 @@ MAINTAINER {{ maintainer }} {% block kubernetes_entrypoint_header %}{% endblock %} +{% block kubernetes_entrypoint_install_binary %} RUN curl -Lo /usr/local/bin/kubernetes-entrypoint https://github.com/stackanetes/kubernetes-entrypoint/releases/download/v0.1.1/kubernetes-entrypoint \ && chmod 755 /usr/local/bin/kubernetes-entrypoint +{% endblock %} {% block kubernetes_entrypoint_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 1609530bf..9d3adf683 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -13,8 +13,10 @@ MAINTAINER {{ maintainer }} {{ 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 +{% endblock %} {% block kubetoolbox_footer %}{% endblock %} {% block footer %}{% endblock %} |