diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-23 20:06:50 +0000 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-28 16:45:16 +0100 |
| commit | 623e54da372563d068f0edf979b04996d70b306c (patch) | |
| tree | 10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/barbican | |
| parent | ce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff) | |
| download | kolla-623e54da372563d068f0edf979b04996d70b306c.tar.gz kolla-623e54da372563d068f0edf979b04996d70b306c.zip | |
Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.
Change-Id: I906ed89c10b12886665618752f525ba71d83d991
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 |