diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-29 02:17:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-29 02:17:29 +0000 |
| commit | 34f2387ca8c844222da23b0a31b454270cacfec6 (patch) | |
| tree | e121fc1082da1c9722d667e253d268d01f7b5caf | |
| parent | e5fb6173eac03ce926bda1fb9d7ac375568f8cb9 (diff) | |
| parent | 806a155f8eb1ba16fff641cbf6b54e0d6a78bf97 (diff) | |
| download | kolla-34f2387ca8c844222da23b0a31b454270cacfec6.tar.gz kolla-34f2387ca8c844222da23b0a31b454270cacfec6.zip | |
Merge "Download kafka binaries from within the container"
| -rw-r--r-- | docker/kafka/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index 905444c70..4d73b314c 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -18,10 +18,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {{ macros.install_packages(kafka_packages | customizable("packages")) }} +{% block kafka_install %} +RUN curl -o kafka.tgz http://apache.osuosl.org/kafka/0.10.1.0/kafka_2.11-0.10.1.0.tgz \ + && tar xfvz kafka.tgz \ + && rm kafka.tgz \ + && ln -s kafka* kafka +{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_extend_start -ADD kafka-archive / -RUN ln -s kafka* kafka \ - && useradd --user-group --home-dir /kafka kafka \ +RUN useradd --user-group --home-dir /kafka kafka \ && chmod 755 /usr/local/bin/kolla_extend_start \ && usermod -a -G kolla kafka \ && chown -R kafka: /kafka diff --git a/kolla/common/config.py b/kolla/common/config.py index 0ec595970..8879389b8 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -347,10 +347,6 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic-inspector/' 'ironic-inspector-master.tar.gz')}, - 'kafka': { - 'type': 'url', - 'location': ('http://apache.osuosl.org/kafka/0.10.1.0/' - 'kafka_2.11-0.10.1.0.tgz')}, 'karbor-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/karbor/' |