From 743d9307407e0f9614bb7af03002170df0ca315c Mon Sep 17 00:00:00 2001 From: Moshe Atlow Date: Mon, 3 Apr 2023 15:59:35 +0300 Subject: [PATCH] ansible: revert removing python 2.7 (#3276) --- ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 | 1 + .../roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 | 1 + .../roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 index f5b22c95f..b41a7e42a 100644 --- a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 @@ -22,6 +22,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ git \ curl \ python3.8 \ + python-pip \ python3-pip \ libfontconfig1 \ libtool \ diff --git a/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 index f4bfe3893..12fb5d3c7 100644 --- a/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 @@ -16,6 +16,7 @@ RUN apt-get update \ git \ curl \ python3.8 \ + python-pip \ python3-pip \ python-all \ libfontconfig1 \ diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index 7f987d946..cb18e974e 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -24,6 +24,7 @@ RUN apt-get update && apt-get install apt-utils -y && \ git \ pkg-config \ curl \ + python-pip \ python3.8 \ python3-pip \ libfontconfig1 \