From 06a644bc35aec2015b2a80ce46d6182d18716042 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Mon, 16 Jun 2025 11:56:53 +0100
Subject: [PATCH] Minify base docker image

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 packages/docker/base/default.nix        | 12 +-----------
 packages/docker/nextcloud/default.nix   |  2 --
 packages/docker/nextcloud/entrypoint.sh | 20 ++++++++++++++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/docker/base/default.nix b/packages/docker/base/default.nix
index aa5e964..1782a8d 100644
--- a/packages/docker/base/default.nix
+++ b/packages/docker/base/default.nix
@@ -9,17 +9,7 @@ pkgs.dockerTools.buildImage {
       dockerTools.binSh
       dockerTools.caCertificates
       bashInteractive
-      ncurses
-      coreutils
-      util-linux
-      gnugrep
-      gawk
-      findutils
-      which
-      vim
-      iputils
-      iproute2
-      curl
+      busybox
     ];
     pathsToLink = [
       "/bin"
diff --git a/packages/docker/nextcloud/default.nix b/packages/docker/nextcloud/default.nix
index 9179fa7..e23e1bc 100644
--- a/packages/docker/nextcloud/default.nix
+++ b/packages/docker/nextcloud/default.nix
@@ -134,8 +134,6 @@ pkgs.dockerTools.buildImage {
   name = "nextcloud";
   fromImage = import ../base { inherit pkgs; };
 
-  diskSize = 2048;
-
   copyToRoot = pkgs.buildEnv {
     name = "root";
     paths = [
diff --git a/packages/docker/nextcloud/entrypoint.sh b/packages/docker/nextcloud/entrypoint.sh
index ce10c4a..5ef3e62 100644
--- a/packages/docker/nextcloud/entrypoint.sh
+++ b/packages/docker/nextcloud/entrypoint.sh
@@ -65,8 +65,20 @@ cron
 PHPRC="$(dirname "$(readlink -f "$(which php)")")/../lib/php.ini"
 export PHPRC
 
-setsid --wait httpd "$@" &
-pid=$!
-trap 'kill -INT $pid' INT
-wait $pid
+pidfile=$(mktemp)
+
+# shellcheck disable=SC2016
+setsid sh -c '
+  echo "$$" > "$1"
+  shift
+  exec httpd "$@"
+' _ "$pidfile" "$@" &
+
+until [ -s "$pidfile" ]; do sleep 0.01; done
+
+pid=$(cat "$pidfile")
+rm "$pidfile"
+
+trap 'kill -INT "$pid"' INT
+wait "$pid"
 exit $?