diff options
Diffstat (limited to 'docker/base')
| -rw-r--r--[-rwxr-xr-x] | docker/base/Dockerfile.j2 | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a19733304..be54e9bee 100755..100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -188,51 +188,13 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD && apt-get update \ && apt-get upgrade -y \ && apt-get dist-upgrade -y \ - && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - build-essential \ - python-dev \ - libssl-dev \ - libmariadbclient-dev \ - libxslt1-dev \ - libffi-dev \ - libyaml-dev \ - pkg-config \ + && apt-get install -y --no-install-recommends python \ && 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 \ && rm -rf /usr/lib/python2.7/site-packages \ && ln -s dist-packages /usr/lib/python2.7/site-packages -# Endif for base_distro ubuntu,debian -{% endif %} - -{% if install_type == 'source' %} - -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py \ - && pip --no-cache-dir install \ - python-barbicanclient \ - python-ceilometerclient \ - python-congressclient \ - python-designateclient \ - python-heatclient \ - python-ironicclient \ - python-magnumclient \ - python-manilaclient \ - python-mistralclient \ - python-muranoclient \ - python-saharaclient \ - python-swiftclient \ - python-troveclient \ - python-tuskarclient \ - python-zaqarclient \ - python-openstackclient \ - MySQL-python \ - numpy -# Endif for install_type source {% endif %} COPY kolla-common.sh /opt/kolla/ |