toolset: Reduce the packages installed by APT

Make sure that APT does not install anything unnecessary.

Signed-off-by: Anton Kirilov <[email protected]>

Author: volyrique

Dockerfile

@@ -4,10 +4,11 @@ ARG DEBIAN_FRONTEND=noninteractive
 # WARNING: DON'T PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
 # One -q produces output suitable for logging (mostly hides
 # progress indicators)
-RUN apt-get -yqq update && \
-    apt-get -yqq install \
+RUN apt-get install \
+      --no-install-recommends \
       -o Dpkg::Options::="--force-confdef" \
       -o Dpkg::Options::="--force-confold" \
+      -qqUy \
       cloc \
       curl \
       gcc \

entrypoint.sh

@@ -4,4 +4,4 @@ set -eo pipefail -u
 
 chown -LR "$USER_ID" /var/run
 # Drop permissions of user to match those of the host system
-gosu "$USER_ID" python3 "${FWROOT}/toolset/run-tests.py" "$@"
+exec gosu "$USER_ID" python3 "${FWROOT}/toolset/run-tests.py" "$@"

toolset/wrk/wrk.dockerfile

@@ -4,10 +4,7 @@ FROM ubuntu:24.04
 COPY concurrency.sh pipeline.lua pipeline.sh query.sh ./
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get -yqq update >/dev/null && \
-    apt-get -yqq install >/dev/null \
-      curl \
-      wrk && \
+RUN apt-get install --no-install-recommends -qqUy curl wrk > /dev/null && \
     chmod 777 concurrency.sh pipeline.sh query.sh
 
 # Environment vars required by the wrk scripts with nonsense defaults