summaryrefslogtreecommitdiff
path: root/docker/dind
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-06-05 17:16:49 +0100
committerMark Goddard <mark@stackhpc.com>2019-06-07 17:59:49 +0000
commitb71f2be433568e6c71ea1d54a92dfa6a449dead6 (patch)
treef6df8519175dc8b1e4790b3da4c1095db3d20243 /docker/dind
parentc5d2e9683d8c26e382356a1c1b6d431e78e0f398 (diff)
downloadkolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.tar.gz
kolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.zip
Debian/Ubuntu: more python3 packages for binary
backport: Stein During the switch to Stein UCA, we did not switch all packages to python 3 for Debian/Ubuntu binary images. This change switches some more of those packages. Change-Id: I0bff21384d88ea678608392de2db1ba418c96665 Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> (cherry picked from commit aa59f0db6f88ed0a03169b473fdf6d541d34df9f)
Diffstat (limited to 'docker/dind')
-rw-r--r--docker/dind/Dockerfile.j223
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 %}