From de381efc20d415b4b22f120ee771774d898c255f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 16 May 2018 07:48:21 +0100 Subject: dind: get image buildable for Debian With use of Docker-CE from upstream. Change-Id: If1a6fe3f1654a2c06c3c3882dc56cdfc6945a17e --- docker/dind/Dockerfile.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docker/dind') diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 9e6027589..9f70211a1 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -15,10 +15,19 @@ RUN /bin/true {% elif base_distro in ['debian', 'ubuntu'] %} {% set dind_packages = [ 'btrfs-tools', - 'docker.io', 'openssh-server' ] %} + {% if base_distro in ['debian'] %} + {% set dind_packages = dind_packages + [ + 'docker-ce' + ] %} + {% else %} + {% set dind_packages = dind_packages + [ + 'docker.io' + ] %} + {% endif %} + {% if install_type == 'binary' %} {% set dind_packages = dind_packages + [ 'python-setuptools' -- cgit v1.2.3