diff options
| author | Martin André <m.andre@redhat.com> | 2016-12-19 14:10:54 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-12-19 17:04:34 +0100 |
| commit | 806a155f8eb1ba16fff641cbf6b54e0d6a78bf97 (patch) | |
| tree | 29121961dec496fcf61bae5890f2004ed953d448 | |
| parent | d93d303842b25207416884f6fe91103f0e261410 (diff) | |
| download | kolla-806a155f8eb1ba16fff641cbf6b54e0d6a78bf97.tar.gz kolla-806a155f8eb1ba16fff641cbf6b54e0d6a78bf97.zip | |
Download kafka binaries from within the container
By pulling kafka tgz this way rather than downloading it via the source
build mechanism, we can offer binary builds for kafka image.
Change-Id: I852049a4f86dba7181db25f149205add187071ab
| -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 edebd5022..57f13a2f4 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -274,10 +274,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/' |