Update dockerfiles.

Signed-off-by: Timothy Rule (VM/EMT3) <[email protected]>

Author: timrulebosch

extra/docker/clang-format/Dockerfile

@@ -19,12 +19,13 @@ LABEL maintainer="[email protected]"
 #       Formatting common/yaml.c
 #
 # For permanent activation of these commands, add the ´export´ and ´alias´
-# commands to files ´~/.profile´ and  ´~/.bash_alias´ respectivly.
+# commands to files ´~/.profile´ and  ´~/.bash_alias´ respectively.
 
 
 # Setup basic environment
 # =======================
-RUN apt-get -y update; \
+RUN set -eux; \
+    apt-get -y update; \
     apt-get -y upgrade; \
     apt-get -y install --no-install-recommends \
         ca-certificates \
@@ -33,22 +34,18 @@ RUN apt-get -y update; \
         gnupg \
         less \
         software-properties-common \
-    && \
+        wget \
+    ; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
 
 # Setup CLang Format
 # ==================
-RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - ; \
-    add-apt-repository "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main"; \
-    apt-get -y update; \
-    apt-get -y install --no-install-recommends \
-        clang-format-20 \
-    && \
-    apt-get clean; \
-    rm -rf /var/lib/apt/lists/*; \
-    ln -s /usr/bin/clang-format-20 /usr/bin/clang-format
+RUN set -eux; \
+    wget https://apt.llvm.org/llvm.sh; \
+    chmod +x llvm.sh; \
+    ./llvm.sh 20
 
 COPY clang-format /usr/local/etc/clang-format
 COPY format.sh /usr/local/bin/format.sh

extra/docker/flatc-builder/Dockerfile

@@ -14,7 +14,8 @@ FROM debian:bookworm-slim AS builder
 
 # Setup basic GCC and CMAKE toolchains
 # ====================================
-RUN apt-get -y update; \
+RUN set -eux; \
+    apt-get -y update; \
     apt-get -y upgrade; \
     apt-get -y install --no-install-recommends \
         binutils \
@@ -27,7 +28,7 @@ RUN apt-get -y update; \
         git \
         less \
         make \
-    && \
+    ; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
@@ -36,10 +37,11 @@ RUN apt-get -y update; \
 # ================
 # https://github.com/google/flatbuffers/archive/refs/tags/v2.0.0.tar.gz
 ARG FLATBUFFERS_ARCHIVE_BASE_URL="https://github.com/google/flatbuffers/archive/refs/tags"
-ARG FLATBUFFERS_ARCHIVE_TAG="v22.10.26"
+ARG FLATBUFFERS_ARCHIVE_TAG="v25.9.23"
 ARG FLATBUFFERS_BUILD_TYPE="Release"
 
-RUN curl -fSL "${FLATBUFFERS_ARCHIVE_BASE_URL}/${FLATBUFFERS_ARCHIVE_TAG}.tar.gz" -o flatbuffers.tar.gz \
+RUN set -eux; \
+    curl -fSL "${FLATBUFFERS_ARCHIVE_BASE_URL}/${FLATBUFFERS_ARCHIVE_TAG}.tar.gz" -o flatbuffers.tar.gz \
     && tar xzf flatbuffers.tar.gz \
     && cd flatbuffers-* \
     && cmake -G "Unix Makefiles"  \
@@ -58,7 +60,8 @@ RUN curl -fSL "${FLATBUFFERS_ARCHIVE_BASE_URL}/${FLATBUFFERS_ARCHIVE_TAG}.tar.gz
 ARG FLATCC_ARCHIVE_BASE_URL="https://github.com/dvidelabs/flatcc/archive/refs/tags"
 ARG FLATCC_ARCHIVE_TAG="v0.6.1"
 
-RUN curl -fSL "${FLATCC_ARCHIVE_BASE_URL}/${FLATCC_ARCHIVE_TAG}.tar.gz" -o flatcc.tar.gz \
+RUN set -eux; \
+    curl -fSL "${FLATCC_ARCHIVE_BASE_URL}/${FLATCC_ARCHIVE_TAG}.tar.gz" -o flatcc.tar.gz \
     && tar xzf flatcc.tar.gz \
     && mv flatcc-* flatcc \
     && cd flatcc \
@@ -74,7 +77,8 @@ FROM debian:bookworm-slim
 
 # Setup basic tools
 # =================
-RUN apt-get -y update; \
+RUN set -eux; \
+    apt-get -y update; \
     apt-get -y upgrade; \
     apt-get -y install --no-install-recommends \
         build-essential \
@@ -85,7 +89,7 @@ RUN apt-get -y update; \
         libmsgpack-dev \
         make \
         zip \
-    && \
+    ; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
@@ -112,6 +116,3 @@ RUN tar xzf flatcc.tar.gz \
     && mkdir -p /usr/local/src \
     && mv flatcc-* /usr/local/src/flatcc \
     && rm flatcc.tar.gz
-
-
-# CMD ["/bin/bash", "-c", "tail /dev/null -f"]

extra/docker/gcc-builder/Dockerfile

@@ -8,14 +8,17 @@ LABEL maintainer="[email protected]"
 
 # Setup basic GCC and CMAKE toolchains
 # ====================================
-RUN apt-get -y update; \
+RUN set -eux; \
+    apt-get -y update; \
     apt-get -y upgrade; \
     apt-get -y install --no-install-recommends \
         autoconf \
         automake \
         binutils \
         build-essential \
         ca-certificates \
+        ccache \
+        cmake \
         extra-cmake-modules \
         curl \
         gdb \
@@ -33,49 +36,25 @@ RUN apt-get -y update; \
         redis \
         valgrind \
         zip \
-    && \
+    ; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
-# Install CMake.
-RUN curl -fSL https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh \
-        -o /tmp/cmake-install.sh \
-    && chmod u+x /tmp/cmake-install.sh \
-    && /tmp/cmake-install.sh --skip-license --prefix=/usr/local \
-    && rm /tmp/cmake-install.sh
 
-# Install CMocka.
-RUN curl -fSL https://git.cryptomilk.org/projects/cmocka.git/snapshot/cmocka-1.1.7.tar.gz \
-        -o /tmp/cmocka-1.1.7.tar.gz \
-    && cd /tmp; tar xzf /tmp/cmocka-1.1.7.tar.gz \
-    && cd /tmp/cmocka-1.1.7 \
+# Install CMocka
+# ==============
+ARG CMOCKA_VERSION=1.1.8
+RUN set -eux; \
+    curl -fSL https://git.cryptomilk.org/projects/cmocka.git/snapshot/cmocka-${CMOCKA_VERSION}.tar.gz \
+        -o /tmp/cmocka-${CMOCKA_VERSION}.tar.gz \
+    && cd /tmp; tar xzf /tmp/cmocka-${CMOCKA_VERSION}.tar.gz \
+    && cd /tmp/cmocka-${CMOCKA_VERSION} \
     && mkdir build; cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
     && make; make install \
-    && cd /tmp; rm -rf cmocka-1.1.7; rm /tmp/cmocka-1.1.7.tar.gz
-
-
-FROM base AS ccache
-
-ARG CCACHE_VERSION=4.6.1
-
-# Build Ccache
-# ============
-RUN curl -fSL https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz -o ccache-${CCACHE_VERSION}.tar.gz \
-    && tar xvzf ccache-${CCACHE_VERSION}.tar.gz \
-    && cd ccache-${CCACHE_VERSION} \
-    && mkdir build; cd build \
-    && cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DHIREDIS_FROM_INTERNET=ON \
-        -DZSTD_FROM_INTERNET=ON \
-        .. \
-    && make; make install; which ccache
-
+    && cd /tmp; rm -rf cmocka-${CMOCKA_VERSION}; rm /tmp/cmocka-${CMOCKA_VERSION}.tar.gz
 
 
 # =========================
 # Construct the final image
 # =========================
 FROM base AS final
-
-COPY --from=ccache /usr/local/bin/ccache /usr/local/bin/ccache

extra/docker/python-builder/Dockerfile

@@ -1,12 +1,14 @@
-FROM python:3.8.12-slim-bookworm
+FROM python:3.11-slim-bookworm
 LABEL maintainer="[email protected]"
 
 
 # Setup basic tools
 # =================
-RUN apt-get -y update; \
-    apt-get -y upgrade; \
-    apt-get -y install --no-install-recommends \
+RUN set -eux; \
+    dpkg --add-architecture i386; \
+    apt-get update; \
+    apt-get upgrade; \
+    apt-get install -y --no-install-recommends \
         build-essential \
         ca-certificates \
         cargo \
@@ -15,14 +17,17 @@ RUN apt-get -y update; \
         git \
         gnupg \
         less \
+        libc6-dbg \
+        libc6-dbg:i386 \
         lsb-release \
         make \
         python3-dev \
         redis-tools \
         unzip \
         valgrind \
+        wget \
         zip \
-    && \
+    ; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
@@ -35,11 +40,12 @@ ENV PATH="/opt/venv/bin:$PATH"
 
 # Python Libraries
 # ================
-RUN pip install --upgrade pip; pip install \
+RUN set -eux; \
+    pip install --upgrade pip; pip install \
         aiodocker \
-        flatbuffers==1.12 \
-        grpcio==1.37.1 \
-        grpcio-tools==1.37.1 \
+        flatbuffers \
+        grpcio \
+        grpcio-tools \
         msgpack \
         numpy \
         pip-licenses \
@@ -49,7 +55,7 @@ RUN pip install --upgrade pip; pip install \
         redis \
         twine \
         wheel \
-    && \
+    ; \
     pip list; pip-licenses
 
 
@@ -58,19 +64,14 @@ RUN pip install --upgrade pip; pip install \
 COPY pip.conf /etc/pip.conf
 
 
-# Docker CLI
-# ==========
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && \
-    echo\
-        "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] \
-        https://download.docker.com/linux/debian \
-        $(lsb_release -cs) stable" \
-        | tee /etc/apt/sources.list.d/docker.list > /dev/null
-RUN apt-get -y update; \
-    apt-get -y upgrade; \
-    apt-get -y install --no-install-recommends \
-        docker-ce-cli \
-    && \
-    apt-get clean; \
-    rm -rf /var/lib/apt/lists/*
+# Install Valgrind 3.25.1
+# =======================
+RUN set -eux; \
+    wget https://sourceware.org/pub/valgrind/valgrind-3.25.1.tar.bz2; \
+    tar -xjf valgrind-3.25.1.tar.bz2; \
+    cd valgrind-3.25.1; \
+    ./configure --prefix=/usr; \
+    make; \
+    make install; \
+    cd .. ; \
+    rm -rf valgrind-3.25.1 valgrind-3.25.1.tar.bz2