Bump device-portal and docs for v3 protocol, fix Avahi hostname handl…

…ing (#51)
PlanktoScope · Nov 29, 2024 · eefb8be · eefb8be
1 parent dc43531
commit eefb8be
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,17 @@ All dates in this file are given in the [UTC time zone](https://en.wikipedia.org
 
 - Merged the github.com/PlanktoScope/device-pkgs repo into this pallet, by moving all packages from there into here.
 
+## Unreleased (v2024.0.0-beta.3)
+
+### Changed
+
+- `core/apps/planktoscope/device-portal`: the `ghcr.io/planktoscope/device-portal` container is upgraded from v0.2.3 to v0.2.4.
+- `core/apps/planktoscope/docs`: the `ghcr.io/planktoscope/project-docs` container is upgraded.
+
+### Fixed
+
+- `core/host/machine-name`: the `update-hostname` systemd service provided by this package now explicitly starts before the `avahi-daemon` systemd service, so that Avahi correctly registers the device as `pkscope-{machine-name}.local` instead of registering it as `raspberrypi.local` (based on the default hostname).
+
 ## v2024.0.0-beta.2 - 2024-09-19
 
 ### Added

diff --git a/packages/core/apps/planktoscope/device-portal/compose.yml b/packages/core/apps/planktoscope/device-portal/compose.yml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/planktoscope/device-portal:0.2.3@sha256:8d3dc83ede36e4b17c50393ac3ebc34f684dee2f18c81621072d2a5b869fba70
+    image: ghcr.io/planktoscope/device-portal:0.2.4
 networks:
   default:
     name: none

diff --git a/packages/core/apps/planktoscope/docs/compose-full-site.yml b/packages/core/apps/planktoscope/docs/compose-full-site.yml
@@ -1,3 +1,3 @@
 services:
   server:
-    image: ghcr.io/planktoscope/project-docs:2024.0.0-beta.2@sha256:ce7db9194d20aeb27f07595f6935e41c300061c94867f63b51fd61881cf9d5b8
+    image: ghcr.io/planktoscope/project-docs:sha-087e173
diff --git a/packages/core/apps/planktoscope/docs/compose.yml b/packages/core/apps/planktoscope/docs/compose.yml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/planktoscope/project-docs:2024.0.0-beta.2-minimal@sha256:e4acfdf2fc67884a409bc031af7459c1a48e0bb2d17140a602cb590700ee171e
+    image: ghcr.io/planktoscope/project-docs:sha-087e173-minimal
     volumes:
       - server-data:/data
       - server-config:/config

diff --git a/packages/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service b/packages/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service
@@ -7,6 +7,7 @@ Requires=systemd-hostnamed.service
 After=systemd-hostnamed.service
 Wants=network-pre.target
 Before=network-pre.target
+Before=avahi-daemon.service
 
 [Service]
 Type=oneshot

diff --git a/.../networking/avahi-daemon/overlays/usr/lib/systemd/system/[email protected] b/.../networking/avahi-daemon/overlays/usr/lib/systemd/system/[email protected]
@@ -7,6 +7,8 @@ Wants=avahi-daemon.socket
 [Service]
 Type=simple
 ExecStart=/usr/bin/bash -c "/usr/bin/avahi-publish -a -R %i.local 192.168.4.1"
+# FIXME: replace this with a package to generate a /etc/avahi/hosts file from
+# a /etc/avahi/hosts.d directory, just like how we generate /etc/hosts!
 
 [Install]
 WantedBy=multi-user.target