From 623e54da372563d068f0edf979b04996d70b306c Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Thu, 23 Mar 2017 20:06:50 +0000 Subject: Alphabetize packages Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991 --- docker/base/Dockerfile.j2 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 501d5cbfb..adadb8c34 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -101,10 +101,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ] %} {% set base_centos_yum_repo_packages = [ - 'epel-release ', - 'yum-plugin-priorities', 'centos-release-ceph-jewel', - 'centos-release-qemu-ev' + 'centos-release-qemu-ev', + 'epel-release', + 'yum-plugin-priorities' ] %} {{ macros.install_packages(base_centos_yum_repo_packages | customizable("yum_centos_repo_packages")) }} @@ -170,13 +170,13 @@ RUN yum -y install \ {% block base_redhat_binary_versionlock %}{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ - 'sudo', - 'which', - 'python', + 'iproute', + 'iscsi-initiator-utils', 'lvm2', + 'python', 'scsi-target-utils', - 'iproute', - 'iscsi-initiator-utils' + 'sudo', + 'which' ] %} # Install base packages {{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} @@ -187,13 +187,13 @@ RUN yum -y install \ {% set base_centos_source_packages = [ 'curl', - 'sudo', - 'tar', - 'which', + 'iproute', + 'iscsi-initiator-utils', 'lvm2', 'scsi-target-utils', - 'iproute', - 'iscsi-initiator-utils' + 'sudo', + 'tar', + 'which' ] %} # Update packages {{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }} -- cgit v1.2.3