aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-03 16:17:58 +0000
committerGerrit Code Review <review@openstack.org>2017-04-03 16:17:58 +0000
commit2d278ea347feb254232295b69a90955b588698c3 (patch)
treef42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/base
parenta728239f41a2f1bd9b42d635c596835c934a2698 (diff)
parent623e54da372563d068f0edf979b04996d70b306c (diff)
downloadkolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz
kolla-2d278ea347feb254232295b69a90955b588698c3.zip
Merge "Alphabetize packages"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j226
1 files changed, 13 insertions, 13 deletions
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")) }}