install latest mosquitto from debian sid repository

mosquitto >= 2.0.18 is currently only available from the side repo and it fixes some bugs with the bridge that thin-edge.io is reliant on

Signed-off-by: Reuben Miller <reuben.d.miller@gmail.com>

Author: reubenmiller

.devcontainer/Dockerfile

@@ -22,10 +22,21 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         docker \
         python3 \
         python3-pip \
-        python3-venv \
-        # tedge dependencies
+        python3-venv
+
+# tedge dependencies
+# Install more recent version of mosquitto >= 2.0.18 from debian sid to avoid mosquitto following bugs:
+# The mosquitto repo can't be used as it does not included builds for arm64/aarch64 (only amd64 and armhf)
+# * https://github.com/eclipse/mosquitto/issues/2604 (2.0.11)
+# * https://github.com/eclipse/mosquitto/issues/2634 (2.0.15)
+RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian sid main' > /etc/apt/sources.list.d/debian-sid.list" \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
         mosquitto \
-        mosquitto-clients
+        mosquitto-clients \
+    # Remove sid afterwards to prevent unexpected packages from being installed
+    && rm -f /etc/apt/sources.list.d/debian-sid.list \
+    && apt-get update
 
 # Install gh utility
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \

tests/images/debian-systemd/debian-systemd.dockerfile

@@ -13,14 +13,25 @@ RUN apt-get -y update \
     dbus \
     systemd-sysv \
     ssh \
-    mosquitto \
-    mosquitto-clients \
     vim.tiny \
     nginx \
     netcat-openbsd \
     iputils-ping \
     net-tools
 
+# Install more recent version of mosquitto >= 2.0.18 from debian sid to avoid mosquitto following bugs:
+# The mosquitto repo can't be used as it does not included builds for arm64/aarch64 (only amd64 and armhf)
+# * https://github.com/eclipse/mosquitto/issues/2604 (2.0.11)
+# * https://github.com/eclipse/mosquitto/issues/2634 (2.0.15)
+RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian sid main' > /etc/apt/sources.list.d/debian-sid.list" \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+        mosquitto \
+        mosquitto-clients \
+    # Remove sid afterwards to prevent unexpected packages from being installed
+    && rm -f /etc/apt/sources.list.d/debian-sid.list \
+    && apt-get update
+
 # Remove unnecessary systemd services
 RUN rm -f /lib/systemd/system/multi-user.target.wants/* \
     /etc/systemd/system/*.wants/* \