From 961224c6cf5ac24fc49fc52ab3c51a87348ee35d Mon Sep 17 00:00:00 2001 From: Chao Guo Date: Tue, 17 Jan 2017 16:49:13 +0800 Subject: Use install-pip macro in most source images 1. Enable customization of pip packages in source branch of most images 2. All pip packages install uniformly through install-pip macro, user can easily customize his own pip command (For example using a mirror) Co-Authored-By: Mauricio Lima Change-Id: If09582039f690fa4136e8f33200d5da15e092da7 --- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 6 +++++- docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'docker/ceilometer') diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 65af7e51c..272a47bcc 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -27,9 +27,13 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} +{% set ceilometer_base_pip_packages = [ + '/ceilometer[gnocchi,mongo,mysql]' +] %} + ADD ceilometer-base-archive /ceilometer-base-source RUN ln -s ceilometer-base-source/* ceilometer \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer[gnocchi,mongo,mysql] \ + && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ && chown -R ceilometer: /etc/ceilometer \ diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 6c793b490..cae510035 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -32,7 +32,12 @@ MAINTAINER {{ maintainer }} {% endif %} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} -RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python + +{% set ceilometer_compute_pip_packages = [ + 'libvirt-python' +] %} + +RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }} {% endif %} -- cgit v1.2.3