aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-04 17:04:59 +0000
committerGerrit Code Review <review@openstack.org>2015-12-04 17:04:59 +0000
commit939b464d12d0ae12087a46c828f6db42dc94225c (patch)
tree61cf92840520f2de05ac35070a56b15dd1952f92 /docker/base/Dockerfile.j2
parent7ace0155b800e059194ac19798196bf3f267918d (diff)
parent27c0ae06241e18f6639311aba65657b4ef83cf26 (diff)
downloadkolla-939b464d12d0ae12087a46c828f6db42dc94225c.tar.gz
kolla-939b464d12d0ae12087a46c828f6db42dc94225c.zip
Merge "Add support for copying files from a "zk://" source"
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 2439a22c1..5c3aa5a28 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 \