From d45f4de84b0dfeddd2736eeb7ac2feefb862867a Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 2 Feb 2019 07:38:42 +0100 Subject: [PATCH 1/3] build: add python3-pip to ubuntu1604.Dockerfile.j2 https://pypi.org/project/tap2junit Says that tap2junit is compatible with legacy Python but says nothing about Python 3 compatibility. --- ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 index a9b710112..152accb0f 100644 --- a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 @@ -21,10 +21,13 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ openjdk-8-jre-headless \ curl \ python-pip \ + python3-pip \ libfontconfig1 RUN pip install tap2junit +RUN pip3 install tap2junit + RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }} From cc0752917bacc138f08165e09f760eaa55a0e417 Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 2 Feb 2019 07:51:16 +0100 Subject: [PATCH 2/3] Update ubuntu1804.Dockerfile.j2 --- ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 index 270ba9f31..c58c89bfe 100644 --- a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 @@ -21,10 +21,13 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ openjdk-8-jre-headless \ curl \ python-pip \ + python3-pip \ libfontconfig1 RUN pip install tap2junit +RUN pip3 install tap2junit + RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }} From ef224449f0e108e77d3b464aa3488699b9310ead Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 2 Feb 2019 07:52:03 +0100 Subject: [PATCH 3/3] Update ubuntu1604_sharedlibs.Dockerfile.j2 --- .../roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 index b481c30d1..49561dd13 100644 --- a/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 @@ -23,10 +23,13 @@ RUN apt-get update && apt-get install apt-utils -y && \ openjdk-8-jre-headless \ curl \ python-pip \ + python3-pip \ libfontconfig1 RUN pip install tap2junit +RUN pip3 install tap2junit + RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}