Merge #189

189: riotdocker-base: bump to 2022.04 (Jammy Jellyfish) r=kaspar030 a=kaspar030

Trying to just bump. (/me crossing fingers)

Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>

Author: bors[bot]

riotbuild/Dockerfile

@@ -49,7 +49,7 @@ COPY files/libsocketcan2_0.0.11-1_i386.deb /pkgs/libsocketcan2_0.0.11-1_i386.deb
 # allow the cleanup to actually save space.
 # Total size without cleaning is approximately 1.525 GB (2016-03-08)
 # After adding the cleanup commands the size is approximately 1.497 GB
-ARG LLVM_VERSION=10
+ARG LLVM_VERSION=14
 RUN \
     dpkg --add-architecture i386 >&2 && \
     echo 'Update the package index files to latest available versions' >&2 && \
@@ -64,6 +64,7 @@ RUN \
         ccache \
         cmake \
         curl \
+        cython3 \
         gcc-multilib \
         gdb \
         g++-multilib \
@@ -75,7 +76,7 @@ RUN \
         ninja-build \
         parallel \
         protobuf-compiler \
-        python \
+        python2 \
         python3-setuptools \
         python3-wheel \
         p7zip \
@@ -298,7 +299,7 @@ ENV PATH $PATH:/opt/riot-toolchain/msp430-elf/${RIOT_TOOLCHAIN_GCCPKGVER}/bin
 
 # install required python packages from file
 # numpy must be already installed before installing some other requirements (emlearn)
-RUN pip3 install --no-cache-dir numpy==1.17.4
+RUN pip3 install --no-cache-dir numpy==1.22.4
 COPY requirements.txt /tmp/requirements.txt
 RUN echo 'Installing python3 packages' >&2 \
     && pip3 install --no-cache-dir pybind11 \

riotdocker-base/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 LABEL maintainer="Kaspar Schleiser <kaspar@riot-os.org>"
 

static-test-tools/Dockerfile

@@ -8,16 +8,12 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
-# copy some included packages
-RUN mkdir /pkgs
-ARG COCCINELLE_DEB="coccinelle_1.0.8~19.04npalix1_amd64.deb"
-COPY files/${COCCINELLE_DEB} /pkgs/${COCCINELLE_DEB}
-
 RUN \
     echo 'Update the package index files to latest available versions' >&2 && \
     apt-get update && \
     echo 'Installing static test tools' >&2 && \
     apt-get -y --no-install-recommends install \
+        coccinelle \
         cppcheck \
         doxygen \
         graphviz \
@@ -28,11 +24,8 @@ RUN \
         vera++ \
         wget \
         && \
-    echo 'Installing local packages' >&2 && \
-    apt-get install -y --no-install-recommends /pkgs/*.deb \
-        && \
     echo 'Cleaning up installation files' >&2 && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /pkgs
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install required Python packages
 COPY requirements.txt /tmp/requirements.txt