Update dockerfiles, adding Ubuntu 22.04 and 22.10 and removing obsolete versions.

10 files changed, 34 insertions, 110 deletions

diff --git a/extras/dockerfiles/Dockerfile.ubuntu-18.04 b/extras/dockerfiles/Dockerfile.ubuntu-18.04
deleted file mode 100644
index d458bb4..0000000
--- a/extras/dockerfiles/Dockerfile.ubuntu-18.04
+++ /dev/null
@@ -1,53 +0,0 @@
-FROM ubuntu:18.04
-MAINTAINER Marco Poletti <poletti.marco@gmail.com>
-
-COPY common_install.sh common_cleanup.sh /
-
-RUN bash -x /common_install.sh
-RUN apt-get install -y --no-install-recommends curl
-
-# For the Bazel repository
-RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
-
-RUN echo 'deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8' >> /etc/apt/sources.list.d/bazel.list
-
-COPY ubuntu-18.04_custom.list /etc/apt/sources.list.d/
-
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776
-
-RUN apt-get update -qq
-
-RUN apt-get remove -y python3-pip
-RUN python3 -m easy_install pip
-
-RUN apt-get install -y --allow-unauthenticated --no-install-recommends \
-        g++-8 \
-        g++-7 \
-        g++-6 \
-        g++-5 \
-        clang-3.9 \
-        clang-4.0 \
-        clang-5.0 \
-        clang-6.0 \
-        clang-7 \
-        clang-8 \
-        clang-9 \
-        clang-10 \
-        bazel \
-        git \
-        python3.8 \
-        clang-tidy \
-        clang-format
-
-RUN python3.8 -m easy_install pip
-
-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-20.10 b/extras/dockerfiles/Dockerfile.ubuntu-22.04
index 6b4e52c..87c3057 100644
--- a/extras/dockerfiles/Dockerfile.ubuntu-20.10
+++ b/extras/dockerfiles/Dockerfile.ubuntu-22.04
@@ -1,33 +1,32 @@
-FROM ubuntu:20.10
+FROM ubuntu:22.04
 MAINTAINER Marco Poletti <poletti.marco@gmail.com>
 
 COPY common_install.sh common_cleanup.sh /
 
 RUN bash -x /common_install.sh
 
-COPY ubuntu-20.10_custom.list /etc/apt/sources.list.d/
+COPY ubuntu-22.04_custom.list /etc/apt/sources.list.d/
 
 RUN apt-get update
 
 RUN apt-get remove -y python3-pip
-RUN python3 -m easy_install pip
 
 RUN apt-get install -y --allow-unauthenticated --no-install-recommends \
-        g++-7 \
-        g++-8 \
         g++-9 \
         g++-10 \
-        clang-8 \
-        clang-9 \
-        clang-10 \
+        g++-11 \
+        g++-12 \
         clang-11 \
-        python3.8 \
-        python3.8-distutils \
+        clang-12 \
+        clang-13 \
+        clang-14 \
+        clang-15 \
+        python3 \
+        python3-distutils \
+        python3-pip \
         clang-tidy \
         clang-format
 
-RUN python3.8 -m easy_install pip
-
 RUN pip3 install absl-py
 RUN pip3 install bidict
 RUN pip3 install pytest
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-19.10 b/extras/dockerfiles/Dockerfile.ubuntu-22.10
index ca6be96..f8b45e6 100644
--- a/extras/dockerfiles/Dockerfile.ubuntu-19.10
+++ b/extras/dockerfiles/Dockerfile.ubuntu-22.10
@@ -1,33 +1,31 @@
-FROM ubuntu:19.10
+FROM ubuntu:22.10
 MAINTAINER Marco Poletti <poletti.marco@gmail.com>
 
 COPY common_install.sh common_cleanup.sh /
 
 RUN bash -x /common_install.sh
 
-COPY ubuntu-19.10_custom.list /etc/apt/sources.list.d/
+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++-7 \
-        g++-8 \
         g++-9 \
-        clang-6.0 \
-        clang-7 \
-        clang-8 \
-        clang-9 \
-        clang-10 \
-        python3-sh \
-        python3-typed-ast \
+        g++-10 \
+        g++-11 \
+        g++-12 \
+        clang-11 \
+        clang-13 \
+        clang-14 \
+        clang-15 \
+        python3 \
+        python3-distutils \
         python3-pip \
-        python3-setuptools \
-        python3-networkx \
         clang-tidy \
         clang-format
 
-RUN pip3 install --upgrade pip
-
 RUN pip3 install absl-py
 RUN pip3 install bidict
 RUN pip3 install pytest
diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh
index 7eff017..c530d73 100644
--- a/extras/dockerfiles/common_install.sh
+++ b/extras/dockerfiles/common_install.sh
@@ -25,6 +25,5 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \
     libc++abi1 \
     libc++abi-dev \
     dirmngr \
-    python \
     python3 \
     python3-setuptools
diff --git a/extras/dockerfiles/rebuild_all.sh b/extras/dockerfiles/rebuild_all.sh
index f0e23d2..b5d18fd 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 18.04 19.10 20.04 20.10
+for V in 20.04 22.04 22.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; }")
@@ -32,4 +32,4 @@ done | xargs -P 0 -L 1 -d '\n' bash -c || {
   done
 }
 
-docker push polettimarco/fruit-basesystem
+docker push -a polettimarco/fruit-basesystem
diff --git a/extras/dockerfiles/ubuntu-18.04_custom.list b/extras/dockerfiles/ubuntu-18.04_custom.list
deleted file mode 100644
index 171b878..0000000
--- a/extras/dockerfiles/ubuntu-18.04_custom.list
+++ /dev/null
@@ -1,17 +0,0 @@
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-5.0 main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main
-deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main
-deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main
-
-deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu bionic main
-deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu bionic main
diff --git a/extras/dockerfiles/ubuntu-19.10_custom.list b/extras/dockerfiles/ubuntu-19.10_custom.list
deleted file mode 100644
index ac1b4bd..0000000
--- a/extras/dockerfiles/ubuntu-19.10_custom.list
+++ /dev/null
@@ -1,6 +0,0 @@
-deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan main
-deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan main
-deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main
-deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-9 main
-deb http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main
-deb-src http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main
diff --git a/extras/dockerfiles/ubuntu-20.10_custom.list b/extras/dockerfiles/ubuntu-20.10_custom.list
deleted file mode 100644
index c26e2d9..0000000
--- a/extras/dockerfiles/ubuntu-20.10_custom.list
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/extras/dockerfiles/ubuntu-22.04_custom.list b/extras/dockerfiles/ubuntu-22.04_custom.list
new file mode 100644
index 0000000..472aa61
--- /dev/null
+++ b/extras/dockerfiles/ubuntu-22.04_custom.list
@@ -0,0 +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
diff --git a/extras/dockerfiles/ubuntu-22.10_custom.list b/extras/dockerfiles/ubuntu-22.10_custom.list
new file mode 100644
index 0000000..c91fea3
--- /dev/null
+++ b/extras/dockerfiles/ubuntu-22.10_custom.list
@@ -0,0 +1,4 @@
+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