Merge all into main (#298)

* update s6 version * Bump debian from bookworm-20240513-slim to bookworm-20240612-slim Bumps debian from bookworm-20240513-slim to bookworm-20240612-slim. --- updated-dependencies: - dependency-name: debian dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * add build cleaning script (#294) * add build cleaning script * apt: use autoremove that doesn't sometimes miss stuff * Update usage instructions for Dockerfile.mlatclient (#292) * Update Dockerfile.mlatclient Updated instructions on how to use this baseimage * Update Dockerfile.mlatclient --------- Co-authored-by: Fred Clausen <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: wiedehopf <[email protected]> Co-authored-by: kx1t <[email protected]>
sdr-enthusiasts · Jun 22, 2024 · baa16b8 · baa16b8
1 parent 444e9e4
commit baa16b8
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 35 deletions.
diff --git a/Dockerfile.acars-decoder b/Dockerfile.acars-decoder
@@ -46,5 +46,6 @@ RUN set -x && \
     popd && popd && \
     # Clean up
     apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-    apt-get autoremove -y && \
-    rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+    apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+    rm -rf /src/* && \
+    bash /scripts/clean-build.sh
diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,7 +1,7 @@
-FROM debian:bookworm-20240513-slim
+FROM debian:bookworm-20240612-slim
 
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
-  S6OVERLAY_VERSION="v3.1.6.2" \
+  S6OVERLAY_VERSION="v3.2.0.0" \
   # Fix for any issues with the S6 overlay. We have quite a few legacy services
   # that worked fine under v2, but v3 is more strict and will kill a startup process
   # if it takes more than 5 seconds. tar1090 and rtlsdrairband are the hardest hit
@@ -15,7 +15,9 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # hadolint ignore=DL3008,SC2086,DL3003
-RUN set -x && \
+RUN \
+  --mount=type=bind,source=./,target=/app/ \
+  set -x && \
   TEMP_PACKAGES=() && \
   KEPT_PACKAGES=() && \
   # packages needed to install
@@ -86,10 +88,11 @@ RUN set -x && \
   curl -sSL https://raw.githubusercontent.com/sdr-enthusiasts/Buster-Docker-Fixes/main/install_libseccomp2.sh | bash && \
   chmod +x /etc/s6-overlay/s6-rc.d/libseccomp2/up && \
   chmod +x /etc/s6-overlay/scripts/libseccomp2_check.sh && \
-  curl -sSL https://raw.githubusercontent.com/sdr-enthusiasts/docker-baseimage/main/scripts/common -o /scripts/common && \
+  cp /app/scripts/* /scripts/ && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
 
 ENTRYPOINT [ "/init" ]
diff --git a/Dockerfile.dump978-full b/Dockerfile.dump978-full
@@ -49,5 +49,6 @@ RUN set -x && \
     dump978-fa --json-stdout --stdin --format CS8 < /src/dump978-mutability/sample-data.txt && \
     # Clean up
     apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-    apt-get autoremove -y && \
-    rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+    apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+    rm -rf /src/* && \
+    bash /scripts/clean-build.sh
diff --git a/Dockerfile.mlatclient b/Dockerfile.mlatclient
@@ -5,23 +5,25 @@
 # 1. Create a downloader image like this:
 # FROM ghcr.io/sdr-enthusiasts/docker-baseimage:mlat-client as downloader
 #
-# 2. In your target image, make sure to add this to the APT install list:
-# KEPT_PACKAGES+=(python3-setuptools) && \
+# 2. In your target image, start your RUN command like this:
+# RUN --mount=type=bind,from=downloader,source=/,target=/downloader set -x && \
 #
-# 3. Copy the following files into your target container:
-# COPY --from=downloader /mlatclient.tgz /mlatclient.tgz
+# 3. In your target image in that same RUN command, make sure to add this to the APT install list:
+# KEPT_PACKAGES+=(python3-pkg-resources) && \
 #
-# 4. In a RUN directive for the target image, and after copying /mlatclient.tgz, do this:
-# tar zxf /mlatclient.tgz -C / && rm -f /mlatclient.tgz && \
+# 4. Also in the same RUN command for your target image, do this:
+# tar zxf /downloader/mlatclient.tgz -C / && \
 # ----------------------------------------------------------------------------------------
-FROM debian:bookworm-20240513-slim
+FROM debian:bookworm-20240612-slim
 
 ENV MLATCLIENT_REPO="https://github.com/wiedehopf/mlat-client.git"
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
 
 # hadolint ignore=DL3008,SC2086,DL3003
-RUN set -x && \
+RUN \
+  --mount=type=bind,source=./,target=/app/ \
+  set -x && \
   PACKAGES=() && \
   # packages needed to install
   PACKAGES+=(git) && \
@@ -50,6 +52,7 @@ RUN set -x && \
   #
   # Clean up to keep the build image small:
   apt-get remove -y "${PACKAGES[@]}" && \
-  apt-get autoremove -y && \
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
   apt-get clean && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/* "${dist_pkg_target}" "${mlatclient_target}"
+  rm -rf /src/* "${dist_pkg_target}" "${mlatclient_target}" && \
+  bash /app/scripts/clean-build.sh
diff --git a/Dockerfile.python b/Dockerfile.python
@@ -18,5 +18,6 @@ RUN set -x && \
     && \
     # Clean up
     apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-    apt-get autoremove -y && \
-    rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+    apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+    rm -rf /src/* && \
+    bash /scripts/clean-build.sh
diff --git a/Dockerfile.qemu b/Dockerfile.qemu
@@ -18,5 +18,6 @@ RUN set -x && \
     qemu-aarch64-static --version && \
     # Clean up
     apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-    apt-get autoremove -y && \
-    rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+    apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+    rm -rf /src/* && \
+    bash /scripts/clean-build.sh
diff --git a/Dockerfile.readsb-full b/Dockerfile.readsb-full
@@ -171,5 +171,6 @@ RUN set -x && \
   curl -L -o "$BLADERF_RBF_PATH/adsbx115.rbf" https://www.nuand.com/fpga/adsbx115.rbf && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
diff --git a/Dockerfile.readsb-netonly b/Dockerfile.readsb-netonly
@@ -65,5 +65,6 @@ RUN set -x && \
   cp -v /src/readsb-protobuf/readsb.proto /opt/readsb-protobuf/readsb.proto && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
diff --git a/Dockerfile.rtlsdr b/Dockerfile.rtlsdr
@@ -50,5 +50,6 @@ RUN set -x && \
   popd && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
diff --git a/Dockerfile.soapyrtlsdr b/Dockerfile.soapyrtlsdr
@@ -69,5 +69,6 @@ RUN set -x && \
   SoapySDRUtil --check=rtlsdr && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
diff --git a/Dockerfile.wreadsb b/Dockerfile.wreadsb
@@ -49,5 +49,6 @@ RUN set -x && \
   viewadsb --version && \
   # Clean up
   apt-get remove -y "${TEMP_PACKAGES[@]}" && \
-  apt-get autoremove -y && \
-  rm -rf /src/* /tmp/* /var/lib/apt/lists/*
+  apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
+  rm -rf /src/* && \
+  bash /scripts/clean-build.sh
diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+rm -rf /tmp/* /var/lib/apt/lists/* /var/log/* /var/cache/debconf/templates.dat* /var/lib/dpkg/status-old