Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

riotdocker-base: update to Ubuntu Noble Numbat #239

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions riotbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ RUN \
ninja-build \
parallel \
protobuf-compiler \
python2 \
python3-setuptools \
python3-wheel \
p7zip \
Expand Down Expand Up @@ -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 \
Expand Down
7 changes: 6 additions & 1 deletion riotdocker-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy
FROM ubuntu:noble

LABEL maintainer="Kaspar Schleiser <[email protected]>"

Expand All @@ -12,10 +12,15 @@ 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/*

# 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 \
Expand Down
Loading