aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorChao Guo <guochao@winhong.com>2017-01-17 16:49:13 +0800
committerMauricio Lima <mauriciolimab@gmail.com>2017-02-17 08:49:32 -0300
commit961224c6cf5ac24fc49fc52ab3c51a87348ee35d (patch)
tree23301c12bfd158395e089b7563f0c7058cd2fb6e /docker/barbican
parentdab3b8e8b95cd09f7cc0f99e853cc84b0e1f2638 (diff)
downloadkolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.tar.gz
kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.zip
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 <mauriciolimab@gmail.com> Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
Diffstat (limited to 'docker/barbican')
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j210
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 7b6286235..d96027d2f 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -25,9 +25,17 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
+{% set barbican_base_pip_packages = [
+ 'pastedeploy',
+ 'uwsgi',
+ 'MySQL-python' ,
+ 'python-barbicanclient' ,
+ '/barbican'
+] %}
+
ADD barbican-base-archive /barbican-base-source
RUN ln -s barbican-base-source/* barbican \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pastedeploy uwsgi MySQL-python python-barbicanclient /barbican \
+ && {{ macros.install_pip(barbican_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/barbican \
&& cp -r /barbican/etc/barbican/* /etc/barbican/ \
&& chown -R barbican: /etc/barbican