From 48d3ba509281ba97989bb6e888c2b5c76fa45593 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sun, 6 Jul 2025 11:36:13 +0100 Subject: [PATCH] Refactor container working dirs Signed-off-by: Nikolaos Karaolidis --- hosts/jupiter/users/nick/default.nix | 1 - .../storm/configs/console/podman/authelia/default.nix | 4 ---- .../storm/configs/console/podman/transmission/default.nix | 5 ++--- hosts/jupiter/users/storm/default.nix | 3 +++ packages/docker/authelia/default.nix | 8 ++++++++ packages/docker/gitea/default.nix | 1 + packages/docker/grafana/default.nix | 1 + packages/docker/jellyfin/default.nix | 1 + packages/docker/mariadb/default.nix | 2 +- packages/docker/nextcloud/default.nix | 2 +- packages/docker/ntfy/default.nix | 1 + packages/docker/oidcwarden/default.nix | 1 + packages/docker/outline/default.nix | 2 +- packages/docker/postgresql/default.nix | 2 +- packages/docker/prometheus/default.nix | 1 + packages/docker/redis/default.nix | 2 +- packages/docker/shlink/default.nix | 6 +++--- packages/docker/sish/default.nix | 1 + packages/docker/transmission-protonvpn/default.nix | 1 + 19 files changed, 29 insertions(+), 16 deletions(-) diff --git a/hosts/jupiter/users/nick/default.nix b/hosts/jupiter/users/nick/default.nix index 858ddf0..3426f1c 100644 --- a/hosts/jupiter/users/nick/default.nix +++ b/hosts/jupiter/users/nick/default.nix @@ -10,7 +10,6 @@ in (import ../../../common/configs/user { inherit user home; }) (import ../../../common/configs/user/console/btop { inherit user home; }) - (import ../../../common/configs/user/console/dive { inherit user home; }) (import ../../../common/configs/user/console/fastfetch { inherit user home; }) (import ../../../common/configs/user/console/git { inherit user home; }) (import ../../../common/configs/user/console/home-manager { inherit user home; }) diff --git a/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix b/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix index 8345ac1..8eb7070 100644 --- a/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix +++ b/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix @@ -196,10 +196,6 @@ in networks.traefik.ref networks.prometheus.ref ]; - exec = [ - "--config" - "/etc/authelia/configuration.yaml" - ]; labels = [ "traefik.enable=true" "traefik.http.routers.authelia.rule=Host(`id.karaolidis.com`)" diff --git a/hosts/jupiter/users/storm/configs/console/podman/transmission/default.nix b/hosts/jupiter/users/storm/configs/console/podman/transmission/default.nix index 12f155b..0308b56 100644 --- a/hosts/jupiter/users/storm/configs/console/podman/transmission/default.nix +++ b/hosts/jupiter/users/storm/configs/console/podman/transmission/default.nix @@ -23,8 +23,7 @@ in ]; virtualisation.quadlet = { - # Not internal, we need network access for obvious reasons - networks.transmission-ext = { }; + networks.transmission = { }; volumes.transmission-config = { }; @@ -33,7 +32,7 @@ in containerConfig = { image = "docker-archive:${selfPkgs.docker-transmission-protonvpn}"; networks = [ - networks.transmission-ext.ref + networks.transmission.ref networks.traefik.ref ]; addCapabilities = [ "NET_ADMIN" ]; diff --git a/hosts/jupiter/users/storm/default.nix b/hosts/jupiter/users/storm/default.nix index 7162946..018d934 100644 --- a/hosts/jupiter/users/storm/default.nix +++ b/hosts/jupiter/users/storm/default.nix @@ -15,6 +15,9 @@ in (import ../../../common/configs/user/console/podman { inherit user home; }) (import ../../../common/configs/user/console/sops { inherit user home; }) (import ../../../common/configs/user/console/tmux { inherit user home; }) + (import ../../../common/configs/user/console/tree { inherit user home; }) + (import ../../../common/configs/user/console/yazi { inherit user home; }) + (import ../../../common/configs/user/console/zoxide { inherit user home; }) (import ../../../common/configs/user/console/zsh { inherit user home; }) (import ./configs/console/btop { inherit user home; }) diff --git a/packages/docker/authelia/default.nix b/packages/docker/authelia/default.nix index 0bc98ed..eabe423 100644 --- a/packages/docker/authelia/default.nix +++ b/packages/docker/authelia/default.nix @@ -11,8 +11,16 @@ pkgs.dockerTools.buildImage { config = { Entrypoint = [ "authelia" ]; + Cmd = [ + "--config" + "/etc/authelia/configuration.yaml" + ]; ExposedPorts = { "9091/tcp" = { }; }; + WorkingDir = "/etc/authelia"; + Volumes = { + "/etc/authelia" = { }; + }; }; } diff --git a/packages/docker/gitea/default.nix b/packages/docker/gitea/default.nix index 7fcbefe..6f7c5b5 100644 --- a/packages/docker/gitea/default.nix +++ b/packages/docker/gitea/default.nix @@ -27,6 +27,7 @@ pkgs.dockerTools.buildImage { "3000/tcp" = { }; }; Env = [ "GITEA_WORK_DIR=/var/lib/gitea/" ]; + WorkingDir = "/var/lib/gitea"; Volumes = { "/var/lib/gitea/data" = { }; "/var/lib/gitea/log" = { }; diff --git a/packages/docker/grafana/default.nix b/packages/docker/grafana/default.nix index 46582db..21340db 100644 --- a/packages/docker/grafana/default.nix +++ b/packages/docker/grafana/default.nix @@ -25,6 +25,7 @@ pkgs.dockerTools.buildImage { "--config" "/etc/grafana/grafana.ini" ]; + WorkingDir = "/etc/grafana"; ExposedPorts = { "3000/tcp" = { }; }; diff --git a/packages/docker/jellyfin/default.nix b/packages/docker/jellyfin/default.nix index 19ed3ca..ac91dd6 100644 --- a/packages/docker/jellyfin/default.nix +++ b/packages/docker/jellyfin/default.nix @@ -98,6 +98,7 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "8096/tcp" = { }; }; + WorkingDir = "/var/lib/jellyfin"; Volumes = { "/etc/jellyfin" = { }; "/var/lib/jellyfin" = { }; diff --git a/packages/docker/mariadb/default.nix b/packages/docker/mariadb/default.nix index 9c4c27f..ece913c 100644 --- a/packages/docker/mariadb/default.nix +++ b/packages/docker/mariadb/default.nix @@ -31,10 +31,10 @@ pkgs.dockerTools.buildImage { config = { Entrypoint = [ "entrypoint" ]; - WorkingDir = "/var/lib/mysql"; ExposedPorts = { "3306/tcp" = { }; }; + WorkingDir = "/var/lib/mysql"; Volumes = { "/var/lib/mysql" = { }; }; diff --git a/packages/docker/nextcloud/default.nix b/packages/docker/nextcloud/default.nix index e23e1bc..93fba5d 100644 --- a/packages/docker/nextcloud/default.nix +++ b/packages/docker/nextcloud/default.nix @@ -166,12 +166,12 @@ pkgs.dockerTools.buildImage { "-f" "/etc/httpd/httpd.conf" ]; + WorkingDir = "/var/lib/nextcloud"; Volumes = { "/var/www/nextcloud/config" = { }; "/var/www/nextcloud/apps" = { }; "/var/lib/nextcloud" = { }; }; - WorkingDir = "/var/www/nextcloud"; ExposedPorts = { "80/tcp" = { }; }; diff --git a/packages/docker/ntfy/default.nix b/packages/docker/ntfy/default.nix index 72f5458..653d7e5 100644 --- a/packages/docker/ntfy/default.nix +++ b/packages/docker/ntfy/default.nix @@ -15,6 +15,7 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "80/tcp" = { }; }; + WorkingDir = "/var/lib/ntfy"; Volumes = { "/var/lib/ntfy" = { }; }; diff --git a/packages/docker/oidcwarden/default.nix b/packages/docker/oidcwarden/default.nix index ff00cf7..6f8d2ab 100644 --- a/packages/docker/oidcwarden/default.nix +++ b/packages/docker/oidcwarden/default.nix @@ -31,6 +31,7 @@ pkgs.dockerTools.buildImage { "ROCKET_PROFILE=release" "ROCKET_ADDRESS=0.0.0.0" ]; + WorkingDir = "/var/lib/vaultwarden"; Volumes = { "/var/lib/vaultwarden" = { }; }; diff --git a/packages/docker/outline/default.nix b/packages/docker/outline/default.nix index cce9655..c0145b5 100644 --- a/packages/docker/outline/default.nix +++ b/packages/docker/outline/default.nix @@ -17,9 +17,9 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "3000/tcp" = { }; }; + WorkingDir = "${pkgs.outline}/share/outline"; Volumes = { "/var/lib/outline/data" = { }; }; - WorkingDir = "${pkgs.outline}/share/outline"; }; } diff --git a/packages/docker/postgresql/default.nix b/packages/docker/postgresql/default.nix index e6f240b..2d8daa6 100644 --- a/packages/docker/postgresql/default.nix +++ b/packages/docker/postgresql/default.nix @@ -37,10 +37,10 @@ pkgs.dockerTools.buildImage { config = { Entrypoint = [ "entrypoint" ]; - WorkingDir = "/var/lib/postgresql"; ExposedPorts = { "5432/tcp" = { }; }; + WorkingDir = "/var/lib/postgresql"; Volumes = { "/var/lib/postgresql/data" = { }; }; diff --git a/packages/docker/prometheus/default.nix b/packages/docker/prometheus/default.nix index 4d01824..94f0bc5 100644 --- a/packages/docker/prometheus/default.nix +++ b/packages/docker/prometheus/default.nix @@ -14,6 +14,7 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "9090/tcp" = { }; }; + WorkingDir = "/var/lib/prometheus"; Volumes = { "/var/lib/prometheus" = { }; }; diff --git a/packages/docker/redis/default.nix b/packages/docker/redis/default.nix index aea4aae..c20f6c6 100644 --- a/packages/docker/redis/default.nix +++ b/packages/docker/redis/default.nix @@ -17,10 +17,10 @@ pkgs.dockerTools.buildImage { config = { Entrypoint = [ "redis-server" ]; - WorkingDir = "/var/lib/redis"; ExposedPorts = { "6379/tcp" = { }; }; + WorkingDir = "/var/lib/redis"; Volumes = { "/var/lib/redis" = { }; }; diff --git a/packages/docker/shlink/default.nix b/packages/docker/shlink/default.nix index efc00d2..a7e8299 100644 --- a/packages/docker/shlink/default.nix +++ b/packages/docker/shlink/default.nix @@ -70,12 +70,12 @@ pkgs.dockerTools.buildImage { config = { Entrypoint = [ "entrypoint" ]; + ExposedPorts = { + "8080/tcp" = { }; + }; WorkingDir = "/var/www/shlink"; Volumes = { "/var/www/shlink/data" = { }; }; - ExposedPorts = { - "8080/tcp" = { }; - }; }; } diff --git a/packages/docker/sish/default.nix b/packages/docker/sish/default.nix index acc2fa5..7a8ff46 100644 --- a/packages/docker/sish/default.nix +++ b/packages/docker/sish/default.nix @@ -22,6 +22,7 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "2222/tcp" = { }; }; + WorkingDir = "/etc/sish"; Volumes = { "/etc/sish/keys" = { }; "/etc/sish/pubkeys" = { }; diff --git a/packages/docker/transmission-protonvpn/default.nix b/packages/docker/transmission-protonvpn/default.nix index b8a6c2d..c2fe42a 100644 --- a/packages/docker/transmission-protonvpn/default.nix +++ b/packages/docker/transmission-protonvpn/default.nix @@ -44,6 +44,7 @@ pkgs.dockerTools.buildImage { ExposedPorts = { "9091/tcp" = { }; }; + WorkingDir = "/var/lib/transmission"; Volumes = { "/etc/transmission" = { }; "/var/lib/transmission" = { };