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/ceph/ceph-base/Dockerfile.j2 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'docker/ceph') diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 9b53abd4d..1adcd5731 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -9,25 +9,25 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceph_base_packages = [ + 'btrfs-progs', 'ceph', 'ceph-fuse', 'ceph-radosgw', - 'parted', + 'e2fsprogs', 'hdparm', - 'btrfs-progs', - 'xfsprogs', - 'e2fsprogs' + 'parted', + 'xfsprogs' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set ceph_base_packages = [ + 'btrfs-tools', 'ceph', 'ceph-fuse', - 'radosgw', - 'parted', + 'e2fsprogs', 'hdparm', - 'btrfs-tools', - 'xfsprogs', - 'e2fsprogs' + 'parted', + 'radosgw', + 'xfsprogs' ] %} {% endif %} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }} -- cgit v1.2.3