Skip to content

ansible: update Java for arm Dockerfiles #4358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richardlau wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −9
Open

ansible: update Java for arm Dockerfiles #4358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3c869e
ansible: update Java for arm Dockerfiles
richardlau Jun 8, 2026
b8e4cd9
fixup! ansible: update Java for arm Dockerfiles
richardlau Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...r/templates/debian11_armv7l.Dockerfile.j2 → ...r/templates/debian13_armv7l.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 /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
Expand All @@ -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 /usr/local/venv \
&& /usr/local/venv/bin/pip3 install tap2junit=={{ tap2junit_version }}

RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down