From b34a15c3725433e0f1fa6bc24d73fccb239cf42a Mon Sep 17 00:00:00 2001
From: DevilaN <devilan@o2.pl>
Date: Thu, 20 Oct 2022 11:35:11 +0200
Subject: [PATCH] Entrypoint with scripts directory + moved mount.sh to scripts
 directory

---
 services/AUTOMATIC1111/Dockerfile             |  6 ++--
 .../10-mount.sh}                              |  0
 services/AUTOMATIC1111/docker-entrypoint.sh   | 32 +++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 rename services/AUTOMATIC1111/{mount.sh => docker-entrypoint.d/10-mount.sh} (100%)
 create mode 100755 services/AUTOMATIC1111/docker-entrypoint.sh

diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index c36a90e..0c8d9b7 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -75,13 +75,13 @@ RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
 
 COPY . /docker
 RUN <<EOF
-chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+chmod +x /docker/docker-entrypoint.sh /docker/docker-entrypoint.d/*.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 EOF
+ENTRYPOINT ["/docker/docker-entrypoint.sh"]
 
 
 ENV CLI_ARGS=""
 WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && \
-  python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
+CMD python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/docker-entrypoint.d/10-mount.sh
similarity index 100%
rename from services/AUTOMATIC1111/mount.sh
rename to services/AUTOMATIC1111/docker-entrypoint.d/10-mount.sh
diff --git a/services/AUTOMATIC1111/docker-entrypoint.sh b/services/AUTOMATIC1111/docker-entrypoint.sh
new file mode 100755
index 0000000..0b8d349
--- /dev/null
+++ b/services/AUTOMATIC1111/docker-entrypoint.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+# vim:sw=4:ts=4:et
+
+set -e
+
+ENTRYPOINT_DIR="/docker/docker-entrypoint.d/"
+
+if /usr/bin/find "$ENTRYPOINT_DIR" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then
+    echo "$0: $ENTRYPOINT_DIR is not empty, will attempt to perform configuration"
+
+    echo "$0: Looking for shell scripts in $ENTRYPOINT_DIR"
+    find "$ENTRYPOINT_DIR" -follow -type f -print | sort -V | while read -r f; do
+    case "$f" in
+        *.sh)
+            if [ -x "$f" ]; then
+                echo "$0: Launching $f";
+                "$f"
+            else
+                # warn on shell scripts without exec bit
+                echo "$0: Ignoring $f, not executable";
+            fi
+            ;;
+        *) echo "$0: Ignoring $f";;
+    esac
+done
+
+echo "$0: Configuration complete; ready for start up"
+else
+    echo "$0: No files found in $ENTRYPOINT_DIR, skipping configuration"
+fi
+
+exec "$@"