diff --git a/extras/dockerfiles/Dockerfile.ubuntu-22.10 b/extras/dockerfiles/Dockerfile.ubuntu-22.10 deleted file mode 100644 index f8b45e64..00000000 --- a/extras/dockerfiles/Dockerfile.ubuntu-22.10 +++ /dev/null @@ -1,38 +0,0 @@ -FROM ubuntu:22.10 -MAINTAINER Marco Poletti - -COPY common_install.sh common_cleanup.sh / - -RUN bash -x /common_install.sh - -COPY ubuntu-22.10_custom.list /etc/apt/sources.list.d/ - -RUN apt-get update - -RUN apt-get remove -y python3-pip - -RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-9 \ - g++-10 \ - g++-11 \ - g++-12 \ - clang-11 \ - clang-13 \ - clang-14 \ - clang-15 \ - python3 \ - python3-distutils \ - python3-pip \ - clang-tidy \ - clang-format - -RUN pip3 install absl-py -RUN pip3 install bidict -RUN pip3 install pytest -RUN pip3 install pytest-xdist -RUN pip3 install sh -RUN pip3 install setuptools -RUN pip3 install networkx -RUN pip3 install wheel - -RUN bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/Dockerfile.ubuntu-23.10 b/extras/dockerfiles/Dockerfile.ubuntu-24.10 similarity index 81% rename from extras/dockerfiles/Dockerfile.ubuntu-23.10 rename to extras/dockerfiles/Dockerfile.ubuntu-24.10 index be91ff8e..fe451c96 100644 --- a/extras/dockerfiles/Dockerfile.ubuntu-23.10 +++ b/extras/dockerfiles/Dockerfile.ubuntu-24.10 @@ -1,30 +1,28 @@ -FROM ubuntu:23.10 +FROM ubuntu:24.10 MAINTAINER Marco Poletti COPY common_install.sh common_cleanup.sh / RUN bash -x /common_install.sh -COPY ubuntu-23.10_custom.list /etc/apt/sources.list.d/ +COPY ubuntu-24.10_custom.list /etc/apt/sources.list.d/ RUN apt-get update RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ - g++-9 \ - g++-10 \ g++-11 \ g++-12 \ g++-13 \ - clang-13 \ + g++-14 \ clang-14 \ clang-15 \ clang-16 \ clang-17 \ clang-18 \ + clang-19 \ python3 \ python3-absl \ python3-bidict \ - python3-distutils \ python3-networkx \ python3-pytest \ python3-pytest-xdist \ diff --git a/extras/dockerfiles/rebuild_all.sh b/extras/dockerfiles/rebuild_all.sh index 48291a70..7e7f0c74 100755 --- a/extras/dockerfiles/rebuild_all.sh +++ b/extras/dockerfiles/rebuild_all.sh @@ -7,7 +7,7 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset COMMANDS=() -for V in 20.04 22.04 22.10 23.10 24.04 +for V in 20.04 22.04 24.04 24.10 do C="docker build --squash -t polettimarco/fruit-basesystem:ubuntu-$V -f Dockerfile.ubuntu-$V ." COMMANDS+=("$C || { echo; echo FAILED: '$C'; echo; exit 1; }") diff --git a/extras/dockerfiles/ubuntu-20.04_custom.list b/extras/dockerfiles/ubuntu-20.04_custom.list index c26e2d97..770a3931 100644 --- a/extras/dockerfiles/ubuntu-20.04_custom.list +++ b/extras/dockerfiles/ubuntu-20.04_custom.list @@ -1,4 +1,4 @@ -deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main -deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main -deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main -deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main +deb http://apt.llvm.org/focal/ llvm-toolchain-focal-19 main +deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-19 main diff --git a/extras/dockerfiles/ubuntu-22.04_custom.list b/extras/dockerfiles/ubuntu-22.04_custom.list index 472aa610..959252c4 100644 --- a/extras/dockerfiles/ubuntu-22.04_custom.list +++ b/extras/dockerfiles/ubuntu-22.04_custom.list @@ -1,4 +1,4 @@ -deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main -deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main -deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main -deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main +deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main +deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main +deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main +deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main diff --git a/extras/dockerfiles/ubuntu-22.10_custom.list b/extras/dockerfiles/ubuntu-22.10_custom.list deleted file mode 100644 index c91fea30..00000000 --- a/extras/dockerfiles/ubuntu-22.10_custom.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://apt.llvm.org/kinetic/ llvm-toolchain-kinetic-14 main -deb-src http://apt.llvm.org/kinetic/ llvm-toolchain-kinetic-14 main -deb http://apt.llvm.org/kinetic/ llvm-toolchain-kinetic-15 main -deb-src http://apt.llvm.org/kinetic/ llvm-toolchain-kinetic-15 main diff --git a/extras/dockerfiles/ubuntu-23.10_custom.list b/extras/dockerfiles/ubuntu-23.10_custom.list deleted file mode 100644 index 1d83246f..00000000 --- a/extras/dockerfiles/ubuntu-23.10_custom.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://apt.llvm.org/mantic/ llvm-toolchain-mantic-17 main -deb-src http://apt.llvm.org/mantic/ llvm-toolchain-mantic-17 main -deb http://apt.llvm.org/mantic/ llvm-toolchain-mantic-18 main -deb-src http://apt.llvm.org/mantic/ llvm-toolchain-mantic-18 main diff --git a/extras/dockerfiles/ubuntu-24.04_custom.list b/extras/dockerfiles/ubuntu-24.04_custom.list index 797b9f9b..6fcbe0da 100644 --- a/extras/dockerfiles/ubuntu-24.04_custom.list +++ b/extras/dockerfiles/ubuntu-24.04_custom.list @@ -1,4 +1,4 @@ -deb http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main -deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main +deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main +deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main diff --git a/extras/dockerfiles/ubuntu-24.10_custom.list b/extras/dockerfiles/ubuntu-24.10_custom.list new file mode 100644 index 00000000..b7a4368c --- /dev/null +++ b/extras/dockerfiles/ubuntu-24.10_custom.list @@ -0,0 +1,4 @@ +deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-18 main +deb-src http://apt.llvm.org/oracular/ llvm-toolchain-oracular-18 main +deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-19 main +deb-src http://apt.llvm.org/oracular/ llvm-toolchain-oracular-19 main diff --git a/extras/dockerfiles/ubuntu_arm-16.04_custom.list b/extras/dockerfiles/ubuntu_arm-16.04_custom.list deleted file mode 100644 index 0ba95de4..00000000 --- a/extras/dockerfiles/ubuntu_arm-16.04_custom.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main -deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main