Merge "ceph-base/dind: switch to btrfs-progs package"

2018-11-29 08:01:15 +00:00 · 2018-11-29 08:01:15 +00:00 · 63fd805c22
parent 6ac5346954 96b6e4e1db
commit 63fd805c22
2 changed files with 2 additions and 2 deletions
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@ -28,7 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% elif base_distro in ['debian', 'ubuntu'] %}

   {% set ceph_base_packages = [
-        'btrfs-tools',
+        'btrfs-progs',
        'ceph',
        'ceph-mds',
        'e2fsprogs',
--- a/docker/dind/Dockerfile.j2
+++ b/docker/dind/Dockerfile.j2
@ -14,7 +14,7 @@ RUN /bin/true

 {% elif base_distro in ['debian', 'ubuntu'] %}
    {% set dind_packages = [
-         'btrfs-tools',
+         'btrfs-progs',
         'openssh-server'
    ] %}