From adf022169efb2a41af68b3c0d0ba4368b1123128 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Mon, 18 Aug 2025 11:11:12 +0300
Subject: [PATCH] Use docker base image pkg

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 packages/docker/adguardhome/default.nix                  | 2 +-
 packages/docker/authelia/default.nix                     | 2 +-
 packages/docker/comentario/default.nix                   | 2 +-
 packages/docker/flaresolverr/default.nix                 | 2 +-
 packages/docker/gitea-act-runner/default.nix             | 2 +-
 packages/docker/gitea/default.nix                        | 2 +-
 packages/docker/grafana-image-renderer/default.nix       | 2 +-
 packages/docker/grafana/default.nix                      | 2 +-
 packages/docker/jellyfin/default.nix                     | 2 +-
 packages/docker/jellyseerr/default.nix                   | 2 +-
 packages/docker/littlelink-server/default.nix            | 2 +-
 packages/docker/mariadb/default.nix                      | 2 +-
 packages/docker/mysql/default.nix                        | 2 +-
 packages/docker/nextcloud/default.nix                    | 2 +-
 packages/docker/nginx-receiver/default.nix               | 2 +-
 packages/docker/nginx/default.nix                        | 2 +-
 packages/docker/ntfy/default.nix                         | 2 +-
 packages/docker/oidcwarden/default.nix                   | 2 +-
 packages/docker/outline/default.nix                      | 2 +-
 packages/docker/postgresql/default.nix                   | 2 +-
 packages/docker/prometheus-fail2ban-exporter/default.nix | 2 +-
 packages/docker/prometheus-node-exporter/default.nix     | 2 +-
 packages/docker/prometheus-podman-exporter/default.nix   | 2 +-
 packages/docker/prometheus-smartctl-exporter/default.nix | 2 +-
 packages/docker/prometheus/default.nix                   | 2 +-
 packages/docker/prowlarr/default.nix                     | 2 +-
 packages/docker/radarr/default.nix                       | 2 +-
 packages/docker/recyclarr/default.nix                    | 2 +-
 packages/docker/redis/default.nix                        | 2 +-
 packages/docker/shlink-web-client/default.nix            | 2 +-
 packages/docker/shlink/default.nix                       | 2 +-
 packages/docker/sish/default.nix                         | 2 +-
 packages/docker/sonarr/default.nix                       | 2 +-
 packages/docker/traefik/default.nix                      | 2 +-
 packages/docker/transmission-protonvpn/default.nix       | 2 +-
 packages/docker/whoami/default.nix                       | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/docker/adguardhome/default.nix b/packages/docker/adguardhome/default.nix
index fd35cb3..0ebc1b1 100644
--- a/packages/docker/adguardhome/default.nix
+++ b/packages/docker/adguardhome/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "adguardhome";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/authelia/default.nix b/packages/docker/authelia/default.nix
index a7a4671..7be99d0 100644
--- a/packages/docker/authelia/default.nix
+++ b/packages/docker/authelia/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "authelia";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/comentario/default.nix b/packages/docker/comentario/default.nix
index 3735727..b928e6c 100644
--- a/packages/docker/comentario/default.nix
+++ b/packages/docker/comentario/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "comentario";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/flaresolverr/default.nix b/packages/docker/flaresolverr/default.nix
index 9555184..46ec208 100644
--- a/packages/docker/flaresolverr/default.nix
+++ b/packages/docker/flaresolverr/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "flaresolverr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/gitea-act-runner/default.nix b/packages/docker/gitea-act-runner/default.nix
index 5a5e247..d4e894a 100644
--- a/packages/docker/gitea-act-runner/default.nix
+++ b/packages/docker/gitea-act-runner/default.nix
@@ -29,7 +29,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "gitea-act-runner";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/gitea/default.nix b/packages/docker/gitea/default.nix
index cbc57c3..018098d 100644
--- a/packages/docker/gitea/default.nix
+++ b/packages/docker/gitea/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "gitea";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/grafana-image-renderer/default.nix b/packages/docker/grafana-image-renderer/default.nix
index 43ea5b0..5756586 100644
--- a/packages/docker/grafana-image-renderer/default.nix
+++ b/packages/docker/grafana-image-renderer/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "grafana-image-renderer";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/grafana/default.nix b/packages/docker/grafana/default.nix
index cfa177a..4bc57d3 100644
--- a/packages/docker/grafana/default.nix
+++ b/packages/docker/grafana/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "grafana";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/jellyfin/default.nix b/packages/docker/jellyfin/default.nix
index fae9710..64ee2e0 100644
--- a/packages/docker/jellyfin/default.nix
+++ b/packages/docker/jellyfin/default.nix
@@ -21,7 +21,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "jellyfin";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/jellyseerr/default.nix b/packages/docker/jellyseerr/default.nix
index 58196d0..17cdfe8 100644
--- a/packages/docker/jellyseerr/default.nix
+++ b/packages/docker/jellyseerr/default.nix
@@ -31,7 +31,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "jellyseerr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/littlelink-server/default.nix b/packages/docker/littlelink-server/default.nix
index c80afda..d0a199e 100644
--- a/packages/docker/littlelink-server/default.nix
+++ b/packages/docker/littlelink-server/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "littlelink-server";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/mariadb/default.nix b/packages/docker/mariadb/default.nix
index 9128807..bec71dc 100644
--- a/packages/docker/mariadb/default.nix
+++ b/packages/docker/mariadb/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "mariadb";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/mysql/default.nix b/packages/docker/mysql/default.nix
index 6a72e8f..58ba371 100644
--- a/packages/docker/mysql/default.nix
+++ b/packages/docker/mysql/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "mysql";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/nextcloud/default.nix b/packages/docker/nextcloud/default.nix
index 28c7459..c352e9a 100644
--- a/packages/docker/nextcloud/default.nix
+++ b/packages/docker/nextcloud/default.nix
@@ -132,7 +132,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "nextcloud";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/nginx-receiver/default.nix b/packages/docker/nginx-receiver/default.nix
index 6e218e7..8681616 100644
--- a/packages/docker/nginx-receiver/default.nix
+++ b/packages/docker/nginx-receiver/default.nix
@@ -4,7 +4,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "nginx-receiver";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/nginx/default.nix b/packages/docker/nginx/default.nix
index b62b9ec..2e6f3af 100644
--- a/packages/docker/nginx/default.nix
+++ b/packages/docker/nginx/default.nix
@@ -31,7 +31,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "nginx";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/ntfy/default.nix b/packages/docker/ntfy/default.nix
index 653d7e5..85b4123 100644
--- a/packages/docker/ntfy/default.nix
+++ b/packages/docker/ntfy/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "ntfy";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/oidcwarden/default.nix b/packages/docker/oidcwarden/default.nix
index 53719f7..e429b19 100644
--- a/packages/docker/oidcwarden/default.nix
+++ b/packages/docker/oidcwarden/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "oidcwarden";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/outline/default.nix b/packages/docker/outline/default.nix
index c0145b5..f35c47f 100644
--- a/packages/docker/outline/default.nix
+++ b/packages/docker/outline/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "outline";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/postgresql/default.nix b/packages/docker/postgresql/default.nix
index 13c38bc..16255ac 100644
--- a/packages/docker/postgresql/default.nix
+++ b/packages/docker/postgresql/default.nix
@@ -13,7 +13,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "postgresql";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prometheus-fail2ban-exporter/default.nix b/packages/docker/prometheus-fail2ban-exporter/default.nix
index edf7361..1466d9c 100644
--- a/packages/docker/prometheus-fail2ban-exporter/default.nix
+++ b/packages/docker/prometheus-fail2ban-exporter/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "prometheus-fail2ban-exporter";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prometheus-node-exporter/default.nix b/packages/docker/prometheus-node-exporter/default.nix
index ab9d3f2..df17bb5 100644
--- a/packages/docker/prometheus-node-exporter/default.nix
+++ b/packages/docker/prometheus-node-exporter/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "prometheus-node-exporter";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prometheus-podman-exporter/default.nix b/packages/docker/prometheus-podman-exporter/default.nix
index 4d42875..5370f96 100644
--- a/packages/docker/prometheus-podman-exporter/default.nix
+++ b/packages/docker/prometheus-podman-exporter/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "prometheus-podman-exporter";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prometheus-smartctl-exporter/default.nix b/packages/docker/prometheus-smartctl-exporter/default.nix
index 92246a0..41b18ad 100644
--- a/packages/docker/prometheus-smartctl-exporter/default.nix
+++ b/packages/docker/prometheus-smartctl-exporter/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "prometheus-smartctl-exporter";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prometheus/default.nix b/packages/docker/prometheus/default.nix
index e777b7a..245dce9 100644
--- a/packages/docker/prometheus/default.nix
+++ b/packages/docker/prometheus/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "prometheus";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/prowlarr/default.nix b/packages/docker/prowlarr/default.nix
index 4284018..ea9bd90 100644
--- a/packages/docker/prowlarr/default.nix
+++ b/packages/docker/prowlarr/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "prowlarr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/radarr/default.nix b/packages/docker/radarr/default.nix
index 9df3c93..7003c9a 100644
--- a/packages/docker/radarr/default.nix
+++ b/packages/docker/radarr/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "radarr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/recyclarr/default.nix b/packages/docker/recyclarr/default.nix
index 6fdc36e..c0c143d 100644
--- a/packages/docker/recyclarr/default.nix
+++ b/packages/docker/recyclarr/default.nix
@@ -13,7 +13,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "recyclarr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/redis/default.nix b/packages/docker/redis/default.nix
index c20f6c6..e2588b8 100644
--- a/packages/docker/redis/default.nix
+++ b/packages/docker/redis/default.nix
@@ -7,7 +7,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "redis";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/shlink-web-client/default.nix b/packages/docker/shlink-web-client/default.nix
index 501a781..6fa626b 100644
--- a/packages/docker/shlink-web-client/default.nix
+++ b/packages/docker/shlink-web-client/default.nix
@@ -52,7 +52,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "shlink-web-client";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/shlink/default.nix b/packages/docker/shlink/default.nix
index 1cd4f06..c226fad 100644
--- a/packages/docker/shlink/default.nix
+++ b/packages/docker/shlink/default.nix
@@ -53,7 +53,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "shlink";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/sish/default.nix b/packages/docker/sish/default.nix
index 7a8ff46..94a9384 100644
--- a/packages/docker/sish/default.nix
+++ b/packages/docker/sish/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "sish";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/sonarr/default.nix b/packages/docker/sonarr/default.nix
index 567605e..35f0fc0 100644
--- a/packages/docker/sonarr/default.nix
+++ b/packages/docker/sonarr/default.nix
@@ -9,7 +9,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "sonarr";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/traefik/default.nix b/packages/docker/traefik/default.nix
index 23142a7..2c9198e 100644
--- a/packages/docker/traefik/default.nix
+++ b/packages/docker/traefik/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 pkgs.dockerTools.buildImage {
   name = "traefik";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/transmission-protonvpn/default.nix b/packages/docker/transmission-protonvpn/default.nix
index f0e676f..e9f4d5a 100644
--- a/packages/docker/transmission-protonvpn/default.nix
+++ b/packages/docker/transmission-protonvpn/default.nix
@@ -14,7 +14,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "transmission-protonvpn";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";
diff --git a/packages/docker/whoami/default.nix b/packages/docker/whoami/default.nix
index f26c778..b0af545 100644
--- a/packages/docker/whoami/default.nix
+++ b/packages/docker/whoami/default.nix
@@ -6,7 +6,7 @@ let
 in
 pkgs.dockerTools.buildImage {
   name = "whoami";
-  fromImage = import ../base { inherit pkgs; };
+  fromImage = pkgs.docker-image-base;
 
   copyToRoot = pkgs.buildEnv {
     name = "root";