From e087cdb6308874338e2bd09e5907bbbea629dc91 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Tue, 15 Jul 2025 16:32:24 +0100 Subject: [PATCH] Refactor docker shadowSetup Signed-off-by: Nikolaos Karaolidis --- packages/docker/base/default.nix | 1 + packages/docker/gitea/default.nix | 4 ---- packages/docker/grafana/default.nix | 1 - packages/docker/jellyfin/default.nix | 4 ---- packages/docker/nextcloud/default.nix | 1 - packages/docker/postgresql/default.nix | 1 - packages/docker/prometheus-podman-exporter/default.nix | 4 ---- packages/docker/prowlarr/default.nix | 4 ---- packages/docker/radarr/default.nix | 4 ---- packages/docker/recyclarr/default.nix | 1 - packages/docker/shlink-web-client/default.nix | 1 - packages/docker/sonarr/default.nix | 4 ---- 12 files changed, 1 insertion(+), 29 deletions(-) diff --git a/packages/docker/base/default.nix b/packages/docker/base/default.nix index 1782a8d..b0a7a39 100644 --- a/packages/docker/base/default.nix +++ b/packages/docker/base/default.nix @@ -21,6 +21,7 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' + ${pkgs.dockerTools.shadowSetup} mkdir -p /tmp ''; } diff --git a/packages/docker/gitea/default.nix b/packages/docker/gitea/default.nix index 6f7c5b5..dcdc7cd 100644 --- a/packages/docker/gitea/default.nix +++ b/packages/docker/gitea/default.nix @@ -12,10 +12,6 @@ pkgs.dockerTools.buildImage { pathsToLink = [ "/bin" ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "gitea" ]; Cmd = [ diff --git a/packages/docker/grafana/default.nix b/packages/docker/grafana/default.nix index 21340db..cfa177a 100644 --- a/packages/docker/grafana/default.nix +++ b/packages/docker/grafana/default.nix @@ -10,7 +10,6 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} mkdir -p /etc/grafana/conf cp -r ${pkgs.grafana}/share/grafana/conf/defaults.ini /etc/grafana/conf/defaults.ini cp -r ${pkgs.grafana}/share/grafana/public /etc/grafana/public diff --git a/packages/docker/jellyfin/default.nix b/packages/docker/jellyfin/default.nix index ac91dd6..81861ac 100644 --- a/packages/docker/jellyfin/default.nix +++ b/packages/docker/jellyfin/default.nix @@ -89,10 +89,6 @@ pkgs.dockerTools.buildImage { ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "entrypoint" ]; ExposedPorts = { diff --git a/packages/docker/nextcloud/default.nix b/packages/docker/nextcloud/default.nix index 93fba5d..71be528 100644 --- a/packages/docker/nextcloud/default.nix +++ b/packages/docker/nextcloud/default.nix @@ -155,7 +155,6 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} mkdir -p /run/httpd ''; diff --git a/packages/docker/postgresql/default.nix b/packages/docker/postgresql/default.nix index 2d8daa6..13c38bc 100644 --- a/packages/docker/postgresql/default.nix +++ b/packages/docker/postgresql/default.nix @@ -29,7 +29,6 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} mkdir -p /etc/postgresql /run/postgresql cp ${postgresql}/share/postgresql/postgresql.conf.sample /etc/postgresql/postgresql.conf ${pkgs.gnused}/bin/sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /etc/postgresql/postgresql.conf diff --git a/packages/docker/prometheus-podman-exporter/default.nix b/packages/docker/prometheus-podman-exporter/default.nix index 5017011..6fd2765 100644 --- a/packages/docker/prometheus-podman-exporter/default.nix +++ b/packages/docker/prometheus-podman-exporter/default.nix @@ -27,10 +27,6 @@ pkgs.dockerTools.buildImage { pathsToLink = [ "/bin" ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "entrypoint" ]; ExposedPorts = { diff --git a/packages/docker/prowlarr/default.nix b/packages/docker/prowlarr/default.nix index 24f5298..4284018 100644 --- a/packages/docker/prowlarr/default.nix +++ b/packages/docker/prowlarr/default.nix @@ -26,10 +26,6 @@ pkgs.dockerTools.buildImage { ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "entrypoint" ]; ExposedPorts = { diff --git a/packages/docker/radarr/default.nix b/packages/docker/radarr/default.nix index 991d20e..9df3c93 100644 --- a/packages/docker/radarr/default.nix +++ b/packages/docker/radarr/default.nix @@ -26,10 +26,6 @@ pkgs.dockerTools.buildImage { ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "entrypoint" ]; ExposedPorts = { diff --git a/packages/docker/recyclarr/default.nix b/packages/docker/recyclarr/default.nix index abb9124..6fdc36e 100644 --- a/packages/docker/recyclarr/default.nix +++ b/packages/docker/recyclarr/default.nix @@ -31,7 +31,6 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} mkdir -p /var/run ''; diff --git a/packages/docker/shlink-web-client/default.nix b/packages/docker/shlink-web-client/default.nix index 495d2d2..fe51d52 100644 --- a/packages/docker/shlink-web-client/default.nix +++ b/packages/docker/shlink-web-client/default.nix @@ -77,7 +77,6 @@ pkgs.dockerTools.buildImage { }; runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} mkdir -p /var/run /var/log/nginx ''; diff --git a/packages/docker/sonarr/default.nix b/packages/docker/sonarr/default.nix index 854e8d2..567605e 100644 --- a/packages/docker/sonarr/default.nix +++ b/packages/docker/sonarr/default.nix @@ -26,10 +26,6 @@ pkgs.dockerTools.buildImage { ]; }; - runAsRoot = '' - ${pkgs.dockerTools.shadowSetup} - ''; - config = { Entrypoint = [ "entrypoint" ]; ExposedPorts = {