Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++-10 \
gcc-10 \
g++-12 \
gcc-12 \
git \
openjdk-17-jre-headless \
curl \
python3-pip \
python-is-python3 \
libfontconfig1 \
libtool \
automake
ccache \
g++-10 \
gcc-10 \
g++-12 \
gcc-12 \
git \
openjdk-25-jre-headless \
curl \
python3-pip \
python-is-python3 \
libfontconfig1 \
libtool \
automake

RUN pip3 install tap2junit=={{ tap2junit_version }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ ENV OSVARIANT docker
ENV DESTCPU {{ arch }}
ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++-10 \
gcc-10 \
g++-12 \
gcc-12 \
git \
openjdk-17-jre-headless \
openjdk-25-jre-headless \
pkg-config \
curl \
python3-pip \
Expand Down
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
30 changes: 15 additions & 15 deletions ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++ \
gcc \
clang-19 \
cargo-1.82 \
rustc-1.82 \
git \
openjdk-21-jre-headless \
curl \
python3-pip \
python3-venv \
python-is-python3 \
libfontconfig1 \
libtool \
automake
ccache \
g++ \
gcc \
clang-19 \
cargo-1.82 \
rustc-1.82 \
git \
openjdk-25-jre-headless \
curl \
python3-pip \
python3-venv \
python-is-python3 \
libfontconfig1 \
libtool \
automake

RUN python3 -m venv /usr/local/venv
RUN pip3 install tap2junit=={{ tap2junit_version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ ENV OSVARIANT docker
ENV DESTCPU {{ arch }}
ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++ \
gcc \
clang-19 \
git \
openjdk-21-jre-headless \
openjdk-25-jre-headless \
pkg-config \
curl \
python3-pip \
Expand Down