Remove Legacy S6 (#215)

* Bump tj-actions/changed-files from 38.1.0 to 38.1.3

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 38.1.0 to 38.1.3.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v38.1.0...v38.1.3)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* temporarily use my S6 install script so we don't blow up the main build

* switch back to osmocon rtl driver

* Bump tj-actions/changed-files from 38.1.0 to 38.2.0

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 38.1.0 to 38.2.0.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v38.1.0...v38.2.0)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Dockerfile.base

* add a few diagnostic packages to base

* fix typo in dockerfile

* update base

* bump to bookworm-20230919-slim

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Dockerfile.base

@@ -1,12 +1,16 @@
-FROM debian:bookworm-20230814-slim
+FROM debian:bookworm-20230919-slim
 
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
   S6OVERLAY_VERSION="v3.1.5.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
   # but we may have others.
-  S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0"
+  S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
+  # this fix is for making sure that the proper pathing is available for scripts
+  # We seem to have an issue (I think it's an upstream bug) that `with-contenv` shebangs will not wor
+  # outside of the S6 supervision tree. This is a workaround for that.
+  PATH="/command:$PATH"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -37,6 +41,10 @@ RUN set -x && \
   # needed to compile s6wrap:
   TEMP_PACKAGES+=(gcc) && \
   TEMP_PACKAGES+=(build-essential) && \
+  # needed for diagnostics
+  KEPT_PACKAGES+=(nano) && \
+  KEPT_PACKAGES+=(iputils-ping) && \
+  KEPT_PACKAGES+=(dnsutils) && \
   # install packages
   ## Builder fixes...
   mkdir -p /usr/sbin/ && \
@@ -49,7 +57,8 @@ RUN set -x && \
   "${TEMP_PACKAGES[@]}" \
   && \
   # install S6 Overlay
-  curl --location --output /tmp/deploy-s6-overlay.sh https://raw.githubusercontent.com/mikenye/deploy-s6-overlay/master/deploy-s6-overlay-v3.sh && \
+  curl --location --output /tmp/deploy-s6-overlay.sh https://raw.githubusercontent.com/fredclausen/deploy-s6-overlay/remove-s6-legacy/deploy-s6-overlay-v3.sh && \
+  # curl --location --output /tmp/deploy-s6-overlay.sh https://raw.githubusercontent.com/mikenye/deploy-s6-overlay/master/deploy-s6-overlay-v3.sh && \
   sh /tmp/deploy-s6-overlay.sh && \
   rm -f /tmp/deploy-s6-overlay.sh && \
   # deploy healthchecks framework

Dockerfile.rtlsdr

@@ -28,8 +28,8 @@ RUN set -x && \
   --branch master \
   --depth 1 \
   --single-branch \
-  #'git://git.osmocom.org/rtl-sdr' \
-  'https://github.com/rtlsdrblog/rtl-sdr-blog.git' \
+  'git://git.osmocom.org/rtl-sdr' \
+  # 'https://github.com/rtlsdrblog/rtl-sdr-blog.git' \
   /src/rtl-sdr \
   && \
   # prepare to build