aboutsummaryrefslogtreecommitdiff
path: root/docker/dind
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-19 04:56:10 +0000
committerGerrit Code Review <review@openstack.org>2018-06-19 04:56:10 +0000
commit747a4789537b053ad3d6630e2ba933c6b2e21fb3 (patch)
tree9605d510eac828b02e26cccb6c75c2ec727ba1b9 /docker/dind
parent30f2c2af92bae2b7db69efbbd4f8949cbafc5aa4 (diff)
parentde381efc20d415b4b22f120ee771774d898c255f (diff)
downloadkolla-747a4789537b053ad3d6630e2ba933c6b2e21fb3.tar.gz
kolla-747a4789537b053ad3d6630e2ba933c6b2e21fb3.zip
Merge "dind: get image buildable for Debian"
Diffstat (limited to 'docker/dind')
-rw-r--r--docker/dind/Dockerfile.j211
1 files changed, 10 insertions, 1 deletions
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'