diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/barbican | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/barbican')
| -rw-r--r-- | docker/barbican/barbican-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index c582b3561..78b27d5b0 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -13,8 +13,8 @@ MAINTAINER {{ maintainer }} ] %} {% elif base_distro in ['ubuntu'] %} {% set barbican_api_packages = [ - 'uwsgi-plugin-python', - 'barbican-api' + 'barbican-api', + 'uwsgi-plugin-python' ] %} {% endif %} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index d96027d2f..f93a6d6d9 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -26,11 +26,11 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(barbican_base_packages | customizable("packages")) }} {% set barbican_base_pip_packages = [ + '/barbican', + 'MySQL-python', 'pastedeploy', - 'uwsgi', - 'MySQL-python' , - 'python-barbicanclient' , - '/barbican' + 'python-barbicanclient', + 'uwsgi' ] %} ADD barbican-base-archive /barbican-base-source |
