From f4b79f47fee6e9ed1a69eefeaba9e291df29f633 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 18 Jan 2024 14:16:15 +0100 Subject: [PATCH 1/5] riotdocker-base: update to Ubuntu Noble Numbat --- riotdocker-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index 75401897..aca5fec7 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM ubuntu:noble LABEL maintainer="Kaspar Schleiser " From c81eecf0aed10b1640a69edfcd51f6d8f441172b Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 6 Feb 2024 23:04:51 +0100 Subject: [PATCH 2/5] riotdocker-base: create riot venv --- riotdocker-base/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index aca5fec7..71804176 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -9,13 +9,15 @@ RUN \ apt-get -y --no-install-recommends install \ gcc \ git \ - python3 \ - python3-dev \ - python3-pip \ + python3-full \ && \ echo 'Clean up installation files' >&2 && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# create python environment that allows "pip install" despite PEP 668 +RUN python3 -m venv /local/python-riot +ENV PATH="/local/python-riot/bin:$PATH" + # compile suid create_user binary COPY create_user.c /tmp/create_user.c RUN gcc -DHOMEDIR=\"/data/riotbuild\" -DUSERNAME=\"riotbuild\" /tmp/create_user.c -o /usr/local/bin/create_user \ From 7f5c378a8cfbb99751c91db6a0cfec5ee96a8f48 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 6 Feb 2024 23:07:54 +0100 Subject: [PATCH 3/5] fixup! riotdocker-base: create riot venv --- riotdocker-base/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index 71804176..50c305e7 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -9,7 +9,9 @@ RUN \ apt-get -y --no-install-recommends install \ gcc \ git \ - python3-full \ + python3 \ + python3-dev \ + python3-pip \ && \ echo 'Clean up installation files' >&2 && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From cb3ac4270ab37a99250c9151ea3bff34cddf67f4 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 6 Feb 2024 23:09:45 +0100 Subject: [PATCH 4/5] fixup! fixup! riotdocker-base: create riot venv --- riotdocker-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index 50c305e7..f0bc75e6 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -12,6 +12,7 @@ RUN \ python3 \ python3-dev \ python3-pip \ + python3-venv \ && \ echo 'Clean up installation files' >&2 && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 389d7a9d9d4b1280890b6e36216345fbd1f0d030 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 6 Feb 2024 23:19:06 +0100 Subject: [PATCH 5/5] riotbuild: drop python2 --- riotbuild/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index e1c1ec6d..f8cf029d 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -76,7 +76,6 @@ RUN \ ninja-build \ parallel \ protobuf-compiler \ - python2 \ python3-setuptools \ python3-wheel \ p7zip \ @@ -122,7 +121,6 @@ RUN \ && echo 'Installing additional packages required for ESP32 toolchain' >&2 && \ apt-get -y --no-install-recommends install \ python3-serial \ - libpython2.7 \ telnet \ && echo 'Installing local packages' >&2 && \ apt-get install -y --no-install-recommends /pkgs/*.deb \