From c98eba90f79ee3d61ab3f6cc3dde6c98ae3b12df Mon Sep 17 00:00:00 2001 From: Misha Baranov Date: Thu, 21 May 2026 15:39:43 +0200 Subject: [PATCH] Add Ubuntu 26.04 folder and remove automake1.11 from all Dockerfiles The automake1.11 package was removed from Debian after Jessie --- images/env-android/Dockerfile | 3 +- images/env-android/images.csv | 6 +- images/env-ubuntu/26.04/Dockerfile | 57 +++++++++++++++++++ images/toolchain-aarch64-linux-gnu/Dockerfile | 1 - .../legacy/arm.com/Dockerfile | 1 - .../legacy/linaro.org/Dockerfile | 1 - .../Dockerfile | 1 - .../toolchain-arm-linux-gnueabihf/Dockerfile | 1 - .../legacy/arm.com/Dockerfile | 1 - .../legacy/linaro.org/Dockerfile | 1 - images/toolchain-linux-android/Dockerfile | 1 - .../12.09/Dockerfile | 1 - .../17.01/Dockerfile | 1 - .../24.10/Dockerfile | 1 - 14 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 images/env-ubuntu/26.04/Dockerfile diff --git a/images/env-android/Dockerfile b/images/env-android/Dockerfile index 062b9e8..53f7fed 100644 --- a/images/env-android/Dockerfile +++ b/images/env-android/Dockerfile @@ -1,4 +1,4 @@ -ARG OPENJDK="openjdk:17-jdk-slim-buster" +ARG OPENJDK="eclipse-temurin:17-jdk-jammy" FROM $OPENJDK ARG API_LEVEL="29" @@ -25,7 +25,6 @@ RUN apt-get install -y \ RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ cmake \ intltool \ libtool \ diff --git a/images/env-android/images.csv b/images/env-android/images.csv index d9ccf22..4fc099b 100644 --- a/images/env-android/images.csv +++ b/images/env-android/images.csv @@ -1,4 +1,4 @@ DOCKERFILE;ARGS (comma-separated list);TAG -;OPENJDK=openjdk:17-jdk-slim-buster;jdk17 -;OPENJDK=openjdk:21-jdk-slim-buster;jdk21 -;OPENJDK=openjdk:21-jdk-slim-buster;latest +;OPENJDK=eclipse-temurin:17-jdk-jammy;jdk17 +;OPENJDK=eclipse-temurin:21-jdk-jammy;jdk21 +;OPENJDK=eclipse-temurin:21-jdk-jammy;latest diff --git a/images/env-ubuntu/26.04/Dockerfile b/images/env-ubuntu/26.04/Dockerfile new file mode 100644 index 0000000..1303a7a --- /dev/null +++ b/images/env-ubuntu/26.04/Dockerfile @@ -0,0 +1,57 @@ +FROM ubuntu:26.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update + +# compilers and tools +RUN apt-get install -y \ + ccache \ + clang \ + clang-17 \ + clang-18 \ + clang-19 \ + clang-20 \ + clang-21 \ + clang-format \ + g++ \ + g++-11 \ + g++-12 \ + g++-13 \ + g++-14 \ + g++-15 \ + git \ + python3 \ + valgrind + +# for 3rd-parties +RUN apt-get install -y \ + autoconf \ + automake \ + cmake \ + intltool \ + libtool \ + m4 \ + make \ + meson \ + pkg-config \ + uuid-dev + +# for roc +RUN apt-get install -y \ + doxygen \ + gengetopt \ + graphviz \ + libasound2-dev \ + libbenchmark-dev \ + libcpputest-dev \ + libpulse-dev \ + libsndfile-dev \ + libsox-dev \ + libspeexdsp-dev \ + libssl-dev \ + libunwind-dev \ + libuv1-dev \ + pulseaudio \ + ragel \ + scons diff --git a/images/toolchain-aarch64-linux-gnu/Dockerfile b/images/toolchain-aarch64-linux-gnu/Dockerfile index 8964660..bb61821 100644 --- a/images/toolchain-aarch64-linux-gnu/Dockerfile +++ b/images/toolchain-aarch64-linux-gnu/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-aarch64-linux-gnu/legacy/arm.com/Dockerfile b/images/toolchain-aarch64-linux-gnu/legacy/arm.com/Dockerfile index 6b94c02..dce4a0f 100644 --- a/images/toolchain-aarch64-linux-gnu/legacy/arm.com/Dockerfile +++ b/images/toolchain-aarch64-linux-gnu/legacy/arm.com/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-aarch64-linux-gnu/legacy/linaro.org/Dockerfile b/images/toolchain-aarch64-linux-gnu/legacy/linaro.org/Dockerfile index 7f0c4b5..7c303f2 100644 --- a/images/toolchain-aarch64-linux-gnu/legacy/linaro.org/Dockerfile +++ b/images/toolchain-aarch64-linux-gnu/legacy/linaro.org/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-arm-bcm2708-linux-gnueabihf/Dockerfile b/images/toolchain-arm-bcm2708-linux-gnueabihf/Dockerfile index 56fcfda..f30d794 100644 --- a/images/toolchain-arm-bcm2708-linux-gnueabihf/Dockerfile +++ b/images/toolchain-arm-bcm2708-linux-gnueabihf/Dockerfile @@ -11,7 +11,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-arm-linux-gnueabihf/Dockerfile b/images/toolchain-arm-linux-gnueabihf/Dockerfile index 642e7b1..36fc9f3 100644 --- a/images/toolchain-arm-linux-gnueabihf/Dockerfile +++ b/images/toolchain-arm-linux-gnueabihf/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-arm-linux-gnueabihf/legacy/arm.com/Dockerfile b/images/toolchain-arm-linux-gnueabihf/legacy/arm.com/Dockerfile index 33f86bb..8cd86bf 100644 --- a/images/toolchain-arm-linux-gnueabihf/legacy/arm.com/Dockerfile +++ b/images/toolchain-arm-linux-gnueabihf/legacy/arm.com/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-arm-linux-gnueabihf/legacy/linaro.org/Dockerfile b/images/toolchain-arm-linux-gnueabihf/legacy/linaro.org/Dockerfile index 303c2f6..113be03 100644 --- a/images/toolchain-arm-linux-gnueabihf/legacy/linaro.org/Dockerfile +++ b/images/toolchain-arm-linux-gnueabihf/legacy/linaro.org/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-linux-android/Dockerfile b/images/toolchain-linux-android/Dockerfile index f585520..5eca36f 100644 --- a/images/toolchain-linux-android/Dockerfile +++ b/images/toolchain-linux-android/Dockerfile @@ -19,7 +19,6 @@ RUN apt-get install -y \ RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ cmake \ intltool \ libtool \ diff --git a/images/toolchain-mips-openwrt-linux-atheros/12.09/Dockerfile b/images/toolchain-mips-openwrt-linux-atheros/12.09/Dockerfile index 04cb2b7..bec6f00 100644 --- a/images/toolchain-mips-openwrt-linux-atheros/12.09/Dockerfile +++ b/images/toolchain-mips-openwrt-linux-atheros/12.09/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-mips-openwrt-linux-atheros/17.01/Dockerfile b/images/toolchain-mips-openwrt-linux-atheros/17.01/Dockerfile index ff9774e..e9f5cbd 100644 --- a/images/toolchain-mips-openwrt-linux-atheros/17.01/Dockerfile +++ b/images/toolchain-mips-openwrt-linux-atheros/17.01/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \ diff --git a/images/toolchain-mips-openwrt-linux-atheros/24.10/Dockerfile b/images/toolchain-mips-openwrt-linux-atheros/24.10/Dockerfile index 1d50f34..639e898 100644 --- a/images/toolchain-mips-openwrt-linux-atheros/24.10/Dockerfile +++ b/images/toolchain-mips-openwrt-linux-atheros/24.10/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update RUN apt-get install -y \ autoconf \ automake \ - automake1.11 \ ccache \ cmake \ g++ \