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>

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 %}