adsb: Move to podman and remove arion

container/adsb/config.nix

@@ -1,11 +0,0 @@
-{
-  systemd.tmpfiles.rules = [
-    "d /etc/container-adsb 0755 root root"
-
-    "d /etc/container-adsb/readsb 0755 1000 1000"
-    "d /etc/container-adsb/readsb/autogain 0755 1000 1000"
-
-    "d /etc/container-adsb/tar1090 0755 1000 1000"
-    "d /etc/container-adsb/tar1090/heatmap 0755 1000 1000"
-  ];
-}

container/adsb/default.nix

@@ -1,16 +1,10 @@
 let
   secret = import ../../secret/container/adsb;
-  custom-config = import ./config.nix;
 in
 {
-  virtualisation.arion.projects.adsb.settings = {
+  virtualisation.oci-containers.containers = {
-    services = {
     readsb = {
-        service = {
       image = "ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest";
-          container_name = "readsb";
-          hostname = "readsb";
-          restart = "unless-stopped";
       environment = {
         "TZ" = "Europe/Berlin";
         "DISABLE_PERFORMANCE_GRAPHS" = "true";
@@ -24,27 +18,21 @@ in
         "READSB_MODEAC" = "true";
         "READSB_RX_LOCATION_ACCURACY" = "2";
       };
-          devices = [ "/dev/bus/usb:/dev/bus/usb" ];
       volumes = [
         "/etc/container-adsb/readsb/autogain:/run/autogain"
       ];
-          tmpfs = [
+      extraOptions = [
-            "/run:exec,size=64M"
+        "--device=/dev/bus/usb:/dev/bus/usb"
-            "/var/log:size=32M"
+        "--tmpfs=/run:exec,size=64M"
+        "--tmpfs=/var/log:size=32M"
+        "--label=com.centurylinklabs.watchtower.enable=true"
+        "--label=io.containers.autoupdate=registry"
       ];
-          labels = {
-            "com.centurylinklabs.watchtower.enable" = "true";
-          };
-        };
     };
 
     mlathub = {
-        service = {
       image = "ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest";
-          container_name = "mlathub";
+      dependsOn = [ "readsb" "piaware" ];
-          hostname = "mlathub";
-          restart = "unless-stopped";
-          depends_on = [ "readsb" "piaware" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "DISABLE_PERFORMANCE_GRAPHS" = "true";
@@ -55,22 +43,17 @@ in
         "READSB_NET_CONNECTOR" = "piaware,30105,beast_in";
         "READSB_NET_BEAST_OUTPUT_PORT" = "30105";
       };
-          tmpfs = [
+      extraOptions = [
-            "/run:exec,size=64M"
+        "--tmpfs=/run:exec,size=64M"
-            "/var/log:size=32M"
+        "--tmpfs=/var/log:size=32M"
+        "--label=com.centurylinklabs.watchtower.enable=true"
+        "--label=io.containers.autoupdate=registry"
       ];
-          labels = {
-            "com.centurylinklabs.watchtower.enable" = "true";
-          };
-        };
     };
 
     tar1090 = {
-        service = {
       image = "ghcr.io/sdr-enthusiasts/docker-tar1090:latest";
-          container_name = "tar1090";
+      dependsOn = [ "readsb" "mlathub" ];
-          restart = "unless-stopped";
-          depends_on = [ "readsb" "mlathub" ];
       ports = [ "8081:80" ];
       environment = {
         "TZ" = "Europe/Berlin";
@@ -87,22 +70,17 @@ in
       volumes = [
         "/etc/container-adsb/tar1090/heatmap:/var/globe_history"
       ];
-          tmpfs = [
+      extraOptions = [
-            "/run:exec,size=64M"
+        "--tmpfs=/run:exec,size=64M"
-            "/var/log"
+        "--tmpfs=/var/log"
+        "--label=com.centurylinklabs.watchtower.enable=true"
+        "--label=io.containers.autoupdate=registry"
       ];
-          labels = {
-            "com.centurylinklabs.watchtower.enable" = "true";
-          };
-        };
     };
 
     fr24feed = {
-        service = {
       image = "ghcr.io/sdr-enthusiasts/docker-flightradar24:latest";
-          container_name = "fr24feed";
+      dependsOn = [ "readsb" ];
-          restart = "unless-stopped";
-          depends_on = [ "readsb" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "BEASTHOST" = "readsb";
@@ -110,18 +88,17 @@ in
         "MLAT" = "yes";
         "FR24KEY" = secret.container.adsb.fr24feed.key;
       };
-          labels = {
+      extraOptions = [
-            "com.centurylinklabs.watchtower.enable" = "true";
+        "--tmpfs=/run:exec,size=64M"
-          };
+        "--tmpfs=/var/log"
-        };
+        "--label=com.centurylinklabs.watchtower.enable=true"
+        "--label=io.containers.autoupdate=registry"
+      ];
     };
 
     piaware = {
-        service = {
       image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";
-          container_name = "piaware";
+      dependsOn = [ "readsb" ];
-          restart = "unless-stopped";
-          depends_on = [ "readsb" ];
       environment = {
         "TZ" = "Europe/Berlin";
         "RECEIVER_TYPE" = "relay";
@@ -133,15 +110,22 @@ in
         "LONG" = secret.container.adsb.readsb.lon;
         "FEEDER_ID" = secret.container.adsb.piaware.feederId;
       };
-          tmpfs = [
+      extraOptions = [
-            "/run:exec,size=64M"
+        "--tmpfs=/run:exec,size=64M"
-            "/var/log"
+        "--tmpfs=/var/log"
+        "--label=com.centurylinklabs.watchtower.enable=true"
+        "--label=io.containers.autoupdate=registry"
       ];
-          labels = {
-            "com.centurylinklabs.watchtower.enable" = "true";
     };
   };
-      };
+
-    };
+  systemd.tmpfiles.rules = [
-  };
+    "d /etc/container-adsb 0755 root root"
-} // custom-config
+
+    "d /etc/container-adsb/readsb 0755 1000 1000"
+    "d /etc/container-adsb/readsb/autogain 0755 1000 1000"
+
+    "d /etc/container-adsb/tar1090 0755 1000 1000"
+    "d /etc/container-adsb/tar1090/heatmap 0755 1000 1000"
+  ];
+}

container/matrix/default.nix

@@ -44,6 +44,11 @@
     };
   };
 
+  networking.firewall.interfaces."podman+" = {
+    allowedUDPPorts = [ 443 ];
+    allowedTCPPorts = [ 443 ];
+  };
+
   systemd.tmpfiles.rules = [
     "d /etc/container-matrix/signald 0775 0 0"
     "d /etc/container-matrix/signal 0775 1337 1337"

system/hosts/adsb-antenna.nix

@@ -14,7 +14,7 @@ in
 
     ../nixos/git.nix
 
-    (import ../nixos/arion.nix (args // { inherit secret; }))
+    ../nixos/arion.nix
     ../../container/adsb
   ];
 

system/nixos/arion.nix

@@ -25,7 +25,7 @@
   };
 
   networking.firewall.interfaces."podman+" = {
-    allowedUDPPorts = [ 53 443 ];
+    allowedUDPPorts = [ 53 ];
-    allowedTCPPorts = [ 53 443 ];
+    allowedTCPPorts = [ 53 ];
   };
 }