From 0df73370bb68d6b6c5d5b0421176f545e64a592f Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sun, 1 Jun 2025 18:22:01 -0400
Subject: [PATCH] add pull=newer and disable autoRemoveOnStop for delugeVPN

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 systems/palatine-hill/docker/act-runner.nix | 3 +++
 systems/palatine-hill/docker/glances.nix    | 1 +
 systems/palatine-hill/docker/minecraft.nix  | 1 +
 systems/palatine-hill/docker/nextcloud.nix  | 4 ++++
 systems/palatine-hill/docker/torr.nix       | 2 ++
 5 files changed, 11 insertions(+)

diff --git a/systems/palatine-hill/docker/act-runner.nix b/systems/palatine-hill/docker/act-runner.nix
index dc7fcfd..543e8c3 100644
--- a/systems/palatine-hill/docker/act-runner.nix
+++ b/systems/palatine-hill/docker/act-runner.nix
@@ -12,6 +12,7 @@ in
   virtualisation.oci-containers.containers = {
     act-stable-latest-main = {
       image = "gitea/act_runner:latest";
+      pull = "newer";
       extraOptions = [
         "--stop-signal=SIGINT"
       ];
@@ -35,6 +36,7 @@ in
 
     act-stable-latest-1 = {
       image = "gitea/act_runner:latest";
+      pull = "newer";
       extraOptions = [
         "--stop-signal=SIGINT"
       ];
@@ -57,6 +59,7 @@ in
 
     act-stable-latest-2 = {
       image = "gitea/act_runner:latest";
+      pull = "newer";
       extraOptions = [
         "--stop-signal=SIGINT"
       ];
diff --git a/systems/palatine-hill/docker/glances.nix b/systems/palatine-hill/docker/glances.nix
index c7757cc..2003f3c 100644
--- a/systems/palatine-hill/docker/glances.nix
+++ b/systems/palatine-hill/docker/glances.nix
@@ -8,6 +8,7 @@ in
   virtualisation.oci-containers.containers = {
     glances = {
       image = "nicolargo/glances:latest-full";
+      pull = "newer";
       extraOptions = [
         "--pid=host"
         "--network=haproxy-net"
diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix
index 0a5d0db..08cdee2 100644
--- a/systems/palatine-hill/docker/minecraft.nix
+++ b/systems/palatine-hill/docker/minecraft.nix
@@ -39,6 +39,7 @@ in
   virtualisation.oci-containers.containers = {
     mc-router = {
       image = "itzg/mc-router:latest";
+      pull = "newer";
       extraOptions = [
         "--network=haproxy-net"
         "--network=minecraft-net"
diff --git a/systems/palatine-hill/docker/nextcloud.nix b/systems/palatine-hill/docker/nextcloud.nix
index bdcb3de..28730b5 100644
--- a/systems/palatine-hill/docker/nextcloud.nix
+++ b/systems/palatine-hill/docker/nextcloud.nix
@@ -9,6 +9,7 @@ let
   nextcloud-base = {
     # image comes from running docker compose build in nextcloud-docker/.examples/full/apache
     image = "nextcloud-nextcloud";
+    pull = "newer";
     hostname = "nextcloud";
     volumes = [
       "${nextcloud_path}/nc_data:/var/www/html:z"
@@ -32,6 +33,7 @@ in
     };
     redis = {
       image = "redis:latest";
+      pull = "newer";
       user = "600:600";
       volumes = [
         "${config.sops.secrets."docker/redis".path}:/usr/local/etc/redis/redis.conf"
@@ -47,6 +49,7 @@ in
     };
     go-vod = {
       image = "radialapps/go-vod:latest";
+      pull = "newer";
       dependsOn = [ "nextcloud" ];
       environment = {
         NEXTCLOUD_HOST = "https://nextcloud.alicehuston.xyz";
@@ -58,6 +61,7 @@ in
     };
     collabora-code = {
       image = "collabora/code:latest";
+      pull = "newer";
       dependsOn = [ "nextcloud" ];
       environment = {
         aliasgroup1 = "https://collabora.nayenoie.com:443";
diff --git a/systems/palatine-hill/docker/torr.nix b/systems/palatine-hill/docker/torr.nix
index 026174f..9b5b43c 100644
--- a/systems/palatine-hill/docker/torr.nix
+++ b/systems/palatine-hill/docker/torr.nix
@@ -2,6 +2,7 @@
 
 let
   delugeBase = {
+    pull = "newer";
     environment = {
       PUID = "600";
       PGID = "100";
@@ -62,6 +63,7 @@ in
       capabilities = {
         NET_ADMIN = true;
       };
+      autoRemoveOnStop = false;
       environment = delugeBase.environment // {
         VPN_ENABLED = "yes";
         VPN_CLIENT = "openvpn";