From acdf91d66871dbd3e222216e589142f91693dffb Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 12 Sep 2025 13:07:53 +0200 Subject: [PATCH] Dockerfiles: Add system packages for the development environment Signed-off-by: Michael Mayer --- docker/develop/jammy/Dockerfile | 9 ++++++--- docker/develop/lunar/Dockerfile | 4 +++- docker/develop/mantic/Dockerfile | 4 +++- docker/develop/noble/Dockerfile | 4 +++- docker/develop/oracular/Dockerfile | 4 +++- docker/develop/plucky/Dockerfile | 9 ++++++--- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/docker/develop/jammy/Dockerfile b/docker/develop/jammy/Dockerfile index 1181b7292..538057022 100644 --- a/docker/develop/jammy/Dockerfile +++ b/docker/develop/jammy/Dockerfile @@ -62,14 +62,17 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ va-driver-all libva2 iputils-ping dnsutils libmagic-mgc \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ - build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ - autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ + build-essential software-properties-common pkg-config apt-utils \ + gcc g++ git autoconf automake cmake gettext apache2-utils davfs2 \ + chrpath tree ripgrep fd-find bat shellcheck shfmt fzf \ + libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ libc6-dev libhdf5-serial-dev libzmq3-dev libssl-dev libnss3 \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \ diff --git a/docker/develop/lunar/Dockerfile b/docker/develop/lunar/Dockerfile index c8fdce5db..0f76857ed 100644 --- a/docker/develop/lunar/Dockerfile +++ b/docker/develop/lunar/Dockerfile @@ -58,7 +58,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ x264 x265 libde265-dev libaom-dev libvpx-dev libwebm-dev libjpeg-dev libmatroska-dev libdvdread-dev \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ + software-properties-common pkg-config apt-utils ripgrep fd-find bat eza \ build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ @@ -66,6 +66,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \ diff --git a/docker/develop/mantic/Dockerfile b/docker/develop/mantic/Dockerfile index 8bf307659..8ad20d8d3 100644 --- a/docker/develop/mantic/Dockerfile +++ b/docker/develop/mantic/Dockerfile @@ -58,7 +58,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ x264 x265 libde265-dev libaom-dev libvpx-dev libwebm-dev libjpeg-dev libmatroska-dev libdvdread-dev \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ + software-properties-common pkg-config apt-utils ripgrep fd-find bat eza \ build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ @@ -66,6 +66,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \ diff --git a/docker/develop/noble/Dockerfile b/docker/develop/noble/Dockerfile index a3faae2ec..f74b3e2fa 100644 --- a/docker/develop/noble/Dockerfile +++ b/docker/develop/noble/Dockerfile @@ -60,7 +60,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ iputils-ping dnsutils \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ + software-properties-common pkg-config apt-utils ripgrep fd-find bat eza \ build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ @@ -68,6 +68,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps libsharpyuv-dev \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \ diff --git a/docker/develop/oracular/Dockerfile b/docker/develop/oracular/Dockerfile index 41da0a741..f59961c41 100644 --- a/docker/develop/oracular/Dockerfile +++ b/docker/develop/oracular/Dockerfile @@ -63,7 +63,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ iputils-ping dnsutils \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ + software-properties-common pkg-config apt-utils ripgrep fd-find bat eza \ build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ @@ -71,6 +71,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps libsharpyuv-dev \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \ diff --git a/docker/develop/plucky/Dockerfile b/docker/develop/plucky/Dockerfile index 333308543..83daeaf97 100644 --- a/docker/develop/plucky/Dockerfile +++ b/docker/develop/plucky/Dockerfile @@ -63,14 +63,17 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ va-driver-all libva2 iputils-ping dnsutils libmagic-mgc \ && \ apt-get -qq install \ - software-properties-common pkg-config apt-utils ripgrep \ - build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \ - autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ + build-essential software-properties-common pkg-config apt-utils \ + gcc g++ git autoconf automake cmake gettext apache2-utils davfs2 \ + chrpath tree ripgrep fd-find bat eza git-delta shellcheck shfmt fzf \ + libtool libjpeg-dev libpng-dev libwebp-dev libavcodec-dev \ libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libxft-dev \ libc6-dev libhdf5-serial-dev libzmq3-dev libssl-dev libnss3 \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \ librsvg2-bin ghostscript gsfonts pdf2svg ps2eps libsharpyuv-dev \ && \ + ln -sf /usr/bin/fdfind /usr/local/bin/fd && \ + ln -sf /usr/bin/batcat /usr/local/bin/bat && \ /scripts/install-nodejs.sh && \ /scripts/install-mariadb.sh mariadb-client && \ /scripts/install-tensorflow.sh && \