aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorAngus Salkeld <asalkeld@mirantis.com>2015-11-19 15:35:22 +1000
committerMichal Rostecki <mrostecki@mirantis.com>2015-12-02 10:25:43 +0100
commit27c0ae06241e18f6639311aba65657b4ef83cf26 (patch)
tree9194e563eeb658eb1c05b7373394fa7a7f0eb182 /docker/base/Dockerfile.j2
parent917b4df01ea342b4bb43d12399322caab53d482a (diff)
downloadkolla-27c0ae06241e18f6639311aba65657b4ef83cf26.tar.gz
kolla-27c0ae06241e18f6639311aba65657b4ef83cf26.zip
Add support for copying files from a "zk://" source
Co-Authored-By: Michal Rostecki <mrostecki@mirantis.com> Implements: blueprint zookeeper Change-Id: I176f063d3802716846b921e210c1569d28bd90d8
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 1c2d31433..149fdee13 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -132,6 +132,9 @@ COPY versionlock.list /etc/yum/pluginconf.d/
RUN yum install -y \
sudo \
which \
+ python \
+ python-jinja2 \
+ python-kazoo \
&& yum clean all
{% endif %}
@@ -167,6 +170,8 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
&& apt-get dist-upgrade -y \
&& apt-get install -y --no-install-recommends \
python \
+ python-jinja2 \
+ python-kazoo \
curl \
&& apt-get clean \
&& sed -i "s|'purelib': '\$base/local/lib/python\$py_version_short/dist-packages',|'purelib': '\$base/lib/python\$py_version_short/dist-packages',|;s|'platlib': '\$platbase/local/lib/python\$py_version_short/dist-packages',|'platlib': '\$platbase/lib/python\$py_version_short/dist-packages',|;s|'headers': '\$base/local/include/python\$py_version_short/\$dist_name',|'headers': '\$base/include/python\$py_version_short/\$dist_name',|;s|'scripts': '\$base/local/bin',|'scripts': '\$base/bin',|;s|'data' : '\$base/local',|'data' : '\$base',|" /usr/lib/python2.7/distutils/command/install.py \