From d3c869e16dc4d409a93346f500f030711cadfb0b Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 8 Jun 2026 17:31:34 +0100 Subject: [PATCH 1/2] ansible: update Java for arm Dockerfiles Signed-off-by: Richard Lau --- ...Dockerfile.j2 => debian13_armv7l.Dockerfile.j2} | 14 ++++++++------ .../docker/templates/ubuntu2204.Dockerfile.j2 | 2 +- .../templates/ubuntu2204_armv7l.Dockerfile.j2 | 2 +- .../templates/ubuntu2204_sharedlibs.Dockerfile.j2 | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) rename ansible/roles/docker/templates/{debian11_armv7l.Dockerfile.j2 => debian13_armv7l.Dockerfile.j2} (79%) diff --git a/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 similarity index 79% rename from ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2 rename to ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 index 9fa1332e6..6547c7659 100644 --- a/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2 +++ b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 @@ -1,11 +1,11 @@ -FROM arm32v7/debian:11 +FROM arm32v7/debian:13 ENV LC_ALL C ENV USER {{ server_user }} ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }} ENV SHELL /bin/bash ENV HOME /home/{{ server_user }} -ENV PATH /usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /home/{{ server_user }}/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu @@ -16,20 +16,22 @@ ENV ARCH {{ arch }} ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \ curl \ - g++-10 \ - gcc-10 \ + g++ \ + gcc \ git \ libfontconfig1 \ - openjdk-17-jre-headless \ + openjdk-25-jre-headless \ pkg-config \ procps \ python3-pip \ + python3-venv \ xz-utils # Prevent Node.js picking up the OS's openssl.cnf, https://github.com/nodejs/node/issues/27862 ENV OPENSSL_CONF /dev/null -RUN pip3 install tap2junit=={{ tap2junit_version }} +RUN python3 -m venv /home/{{ server_user }}/venv \ + && /home/{{ server_user }}/venv/bin/pip3 install tap2junit=={{ tap2junit_version }} RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} diff --git a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 index 6f78f6339..24af68057 100644 --- a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 @@ -21,7 +21,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ g++-12 \ gcc-12 \ git \ - openjdk-17-jre-headless \ + openjdk-25-jre-headless \ curl \ python3-pip \ python-is-python3 \ diff --git a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 index accc17f70..4b37c8c2c 100644 --- a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 @@ -19,7 +19,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \ g++-12 \ gcc-12 \ git \ - openjdk-17-jre-headless \ + openjdk-25-jre-headless \ pkg-config \ curl \ python3-pip \ diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 index 45a07b2fb..91aae89d2 100644 --- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install apt-utils -y && \ g++-12 \ gcc-12 \ git \ - openjdk-17-jre-headless \ + openjdk-25-jre-headless \ pkg-config \ curl \ python3-pip \ From b8e4cd9d363152ac4ee6118f448481ed3f8629cc Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 9 Jun 2026 16:01:28 +0100 Subject: [PATCH 2/2] fixup! ansible: update Java for arm Dockerfiles Signed-off-by: Richard Lau --- .../roles/docker/templates/debian13_armv7l.Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 index 6547c7659..842854ef4 100644 --- a/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 +++ b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2 @@ -5,7 +5,7 @@ ENV USER {{ server_user }} ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }} ENV SHELL /bin/bash ENV HOME /home/{{ server_user }} -ENV PATH /home/{{ server_user }}/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu @@ -30,8 +30,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \ # Prevent Node.js picking up the OS's openssl.cnf, https://github.com/nodejs/node/issues/27862 ENV OPENSSL_CONF /dev/null -RUN python3 -m venv /home/{{ server_user }}/venv \ - && /home/{{ server_user }}/venv/bin/pip3 install tap2junit=={{ tap2junit_version }} +RUN python3 -m venv /usr/local/venv \ + && /usr/local/venv/bin/pip3 install tap2junit=={{ tap2junit_version }} RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}