From 190ffd323757e969927805323e4ea49e4d1f0353 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Wed, 8 Jan 2025 08:12:50 +1100
Subject: [PATCH] missing start.sh in final image v0.2

---
 Dockerfile                             | 2 +-
 dockerfiles/{setup.sh => init.sh}      | 2 +-
 dockerfiles/{pre-setup.sh => start.sh} | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename dockerfiles/{setup.sh => init.sh} (98%)
 rename dockerfiles/{pre-setup.sh => start.sh} (93%)

diff --git a/Dockerfile b/Dockerfile
index 3880337b..b3377b38 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,7 @@ COPY --from=builder --chown=nginx:www-data ${INSTALL_DIR}/ ${INSTALL_DIR}/
 COPY install/crontab /etc/crontabs/root
 
 # Start all required services
-RUN ${INSTALL_DIR}/dockerfiles/pre-setup.sh
+RUN ${INSTALL_DIR}/dockerfiles/start.sh
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=2 \
     CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/php/server/query_json.php?file=app_state.json
diff --git a/dockerfiles/setup.sh b/dockerfiles/init.sh
similarity index 98%
rename from dockerfiles/setup.sh
rename to dockerfiles/init.sh
index b98f841b..ae33b08b 100755
--- a/dockerfiles/setup.sh
+++ b/dockerfiles/init.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 
 echo "---------------------------------------------------------"
-echo "[INSTALL]                                    Run setup.sh"
+echo "[INSTALL]                                    Run init.sh"
 echo "---------------------------------------------------------"
 
 export INSTALL_DIR=/app  # Specify the installation directory here
diff --git a/dockerfiles/pre-setup.sh b/dockerfiles/start.sh
similarity index 93%
rename from dockerfiles/pre-setup.sh
rename to dockerfiles/start.sh
index fcc35bac..2bd36659 100755
--- a/dockerfiles/pre-setup.sh
+++ b/dockerfiles/start.sh
@@ -19,7 +19,7 @@ echo "oneshot" > /etc/s6-overlay/s6-rc.d/SetupOneshot/type
 echo "longrun" > /etc/s6-overlay/s6-rc.d/php-fpm/type
 echo "longrun" > /etc/s6-overlay/s6-rc.d/nginx/type
 echo "longrun" > /etc/s6-overlay/s6-rc.d/$APP_NAME/type
-echo -e "${INSTALL_DIR}/dockerfiles/setup.sh" > /etc/s6-overlay/s6-rc.d/SetupOneshot/up
+echo -e "${INSTALL_DIR}/dockerfiles/init.sh" > /etc/s6-overlay/s6-rc.d/SetupOneshot/up
 echo -e "#!/bin/execlineb -P\n/usr/sbin/php-fpm83 -F" > /etc/s6-overlay/s6-rc.d/php-fpm/run
 echo -e '#!/bin/execlineb -P\nnginx -g "daemon off;"' > /etc/s6-overlay/s6-rc.d/nginx/run
 echo -e '#!/bin/execlineb -P
@@ -38,6 +38,5 @@ touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,$APP_N
 touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm
 touch /etc/s6-overlay/s6-rc.d/$APP_NAME/dependencies.d/nginx
 
-
-
-rm -f $0
+# this removes the current file
+# rm -f $0