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/kolla-toolbox | |
| 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/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 80c65a055..6a908ff37 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -19,12 +19,12 @@ MAINTAINER {{ maintainer }} 'libffi-devel', 'libxml2-devel', 'libxslt-devel', + 'MariaDB-client', 'MariaDB-devel', 'MariaDB-shared', - 'MariaDB-client', + 'openssh-clients', 'openssl-devel', - 'python-devel', - 'openssh-clients' + 'python-devel' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} @@ -37,9 +37,9 @@ MAINTAINER {{ maintainer }} 'jq', 'libffi-dev', 'libmariadbclient-dev', - 'mariadb-client', 'libssl-dev', 'libxslt1-dev', + 'mariadb-client', 'python-dev' ] %} @@ -57,10 +57,10 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ {% endblock %} {% set kolla_toolbox_pip_packages = [ - 'pytz', 'ansible==2.1.1.0', 'MySQL-python', 'os-client-config==1.26.0', + 'pytz', 'pyudev', 'shade==1.16.0' ] %} |
