diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:09 +0000 |
| commit | 17ce7d4de63273a0beca972b5f3cea1a0b62c928 (patch) | |
| tree | 891c4ca26e98910e327ab2183a7ce188d0fcf342 /docker/dind | |
| parent | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (diff) | |
| parent | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (diff) | |
| download | kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.tar.gz kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.zip | |
Merge "Debian/Ubuntu: more python3 packages for binary"
Diffstat (limited to 'docker/dind')
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 33b8fb851..fa5daad14 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -15,31 +15,26 @@ RUN /bin/true {% elif base_package_type == 'deb' %} {% set dind_packages = [ 'btrfs-progs', + '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' + 'python3-docker' ] %} {% endif %} + {{ macros.install_packages(dind_packages | customizable("packages")) }} -{% set dind_pip_packages = [ - 'docker' -] %} + {% if install_type == 'source' %} + + {% set dind_pip_packages = [ + 'docker' + ] %} RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }} + {% endif %} {% endif %} |