From 63165795ca92fadedabb8a7b882f127c24ae37da Mon Sep 17 00:00:00 2001
From: edgarroncero <eroncero@digitalstack.es>
Date: Wed, 12 Feb 2025 21:01:52 +0100
Subject: [PATCH] Multiple changes

---
 app/scripts/healthchecker.sh              | 24 +++++++++++++++++++++++
 app/{ => scripts}/install-dependencies.sh |  2 +-
 app/{ => scripts}/launch-daemons.sh       |  0
 app/{ => scripts}/sury-php-repo.sh        |  0
 dockerfile                                | 13 +++++++-----
 5 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100755 app/scripts/healthchecker.sh
 rename app/{ => scripts}/install-dependencies.sh (90%)
 rename app/{ => scripts}/launch-daemons.sh (100%)
 rename app/{ => scripts}/sury-php-repo.sh (100%)

diff --git a/app/scripts/healthchecker.sh b/app/scripts/healthchecker.sh
new file mode 100755
index 0000000..24751f7
--- /dev/null
+++ b/app/scripts/healthchecker.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Check if nginx is running
+/etc/init.d/nginx status >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+	NGINX="nginx failed!"
+fi
+
+# Check if MariaDB is running
+/etc/init.d/mariadb status >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+	MARIADB="mariadb failed!"
+fi
+
+# Check if PHP-FPM is running
+/etc/init.d/php8.2-fpm status >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+	PHP82="php8.2-fpm failed!"
+fi
+
+if [ -n "$NGINX$MARIADB$PHP82" ]; then
+    echo "$NGINX $MARIADB $PHP82" && exit 1
+fi
+
diff --git a/app/install-dependencies.sh b/app/scripts/install-dependencies.sh
similarity index 90%
rename from app/install-dependencies.sh
rename to app/scripts/install-dependencies.sh
index 0652942..53f230a 100755
--- a/app/install-dependencies.sh
+++ b/app/scripts/install-dependencies.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 apt-get install php8.2 php8.2-common php8.2-fpm -y # PHP
-apt-get install vim file bash-completion procps nginx screen git less -y # Utils
+apt-get install vim file bash-completion procps nginx screen git sudo less -y # Utils
 apt-get install mariadb-client mariadb-server -y # MariaDB Server + Client
diff --git a/app/launch-daemons.sh b/app/scripts/launch-daemons.sh
similarity index 100%
rename from app/launch-daemons.sh
rename to app/scripts/launch-daemons.sh
diff --git a/app/sury-php-repo.sh b/app/scripts/sury-php-repo.sh
similarity index 100%
rename from app/sury-php-repo.sh
rename to app/scripts/sury-php-repo.sh
diff --git a/dockerfile b/dockerfile
index 6dfae10..f61014e 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,14 +1,14 @@
 FROM debian:bookworm
 
-WORKDIR /app
+WORKDIR /app/scripts
 
 COPY app /app
 
-RUN apt-get update && apt-get full-upgrade -y 
+RUN apt-get update && apt-get full-upgrade -y && apt-get autoremove -y && apt-get autoclean -y
 
-RUN /app/sury-php-repo.sh
+#RUN /app/scripts/sury-php-repo.sh
 
-RUN /app/install-dependencies.sh
+RUN /app/scripts/install-dependencies.sh
 
 ENV PORT=8080
 
@@ -16,4 +16,7 @@ EXPOSE 8080
 
 #CMD ["/app/launch-daemons.sh"]
 
-ENTRYPOINT ["/app/launch-daemons.sh"]
+ENTRYPOINT ["/app/scripts/launch-daemons.sh"]
+
+HEALTHCHECK --interval=5m --timeout=30s \
+CMD /app/scripts/healthchecker.sh || exit 1