From 9ac0163f20c48ac5bc9585bdd6cb0341f0153d03 Mon Sep 17 00:00:00 2001
From: root <root@centos.localdomain>
Date: Sat, 2 Mar 2024 01:41:03 +0000
Subject: [PATCH 1/2] removing unneeded package, small tweaks

---
 .dockerignore            | 7 +++++++
 Dockerfile               | 4 ++--
 dockerfiles/pre-setup.sh | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e71adaa9..b9ddb743 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,9 +5,16 @@
 .gitignore
 docker-compose.yml
 Dockerfile
+Dockerfile.debian
 dockerfiles/LICENSE
 dockerfiles/README.md
+dockerfiles/README_ES.md
 docs
 LICENSE.txt
 README.md
 CONTRIBUTING
+FUNDING.yml
+config/.gitignore
+db/.gitignore
+pialert/README.md
+pialert/README_ES.md
diff --git a/Dockerfile b/Dockerfile
index f8227e1d..59e3275c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 # ❗ IMPORTANT - if you modify this file modify the /install/install_dependecies.sh file as well ❗ 
 
 RUN apk update --no-cache \
-    && apk add --no-cache bash zip gettext-envsubst sudo mtr usbutils s6-overlay \
+    && apk add --no-cache bash zip gettext-envsubst sudo mtr s6-overlay \
     && apk add --no-cache curl arp-scan iproute2 iproute2-ss nmap traceroute net-tools net-snmp-tools bind-tools awake ca-certificates \
     && apk add --no-cache sqlite php82 php82-fpm php82-cgi php82-curl php82-sqlite3 php82-session \
     && apk add --no-cache python3 nginx \
@@ -45,7 +45,7 @@ RUN apk update --no-cache \
 
 COPY --from=builder --chown=nginx:www-data ${INSTALL_DIR}/pialert/ ${INSTALL_DIR}/pialert/
 
-RUN /home/pi/pialert/dockerfiles/pre-setup.sh
+RUN ${INSTALL_DIR}/pialert/dockerfiles/pre-setup.sh
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=2 \
   CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/api/app_state.json
diff --git a/dockerfiles/pre-setup.sh b/dockerfiles/pre-setup.sh
index 87b5bea5..a8007176 100755
--- a/dockerfiles/pre-setup.sh
+++ b/dockerfiles/pre-setup.sh
@@ -24,3 +24,5 @@ touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx} /etc/
 touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,pialert} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx,pialert}/dependencies.d/SetupOneshot
 touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm
 touch /etc/s6-overlay/s6-rc.d/pialert/dependencies.d/nginx
+
+rm -f $0

From 06c7ffa39ef00e3c4095b093b7a8dd4c033a86bf Mon Sep 17 00:00:00 2001
From: root <root@centos.localdomain>
Date: Sat, 2 Mar 2024 02:08:40 +0000
Subject: [PATCH 2/2] Fixing hardcoded path

---
 dockerfiles/pre-setup.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dockerfiles/pre-setup.sh b/dockerfiles/pre-setup.sh
index a8007176..01d9bf85 100755
--- a/dockerfiles/pre-setup.sh
+++ b/dockerfiles/pre-setup.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export INSTALL_DIR=/home/pi
+
 # php-fpm setup
 install -d -o nginx -g www-data /run/php/
 sed -i "/^;pid/c\pid = /run/php/php8.2-fpm.pid" /etc/php82/php-fpm.conf
@@ -16,10 +18,11 @@ 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/pialert/type
-echo -e "/home/pi/pialert/dockerfiles/setup.sh" > /etc/s6-overlay/s6-rc.d/SetupOneshot/up
+echo -e "${INSTALL_DIR}/pialert/dockerfiles/setup.sh" > /etc/s6-overlay/s6-rc.d/SetupOneshot/up
 echo -e "#!/bin/execlineb -P\n/usr/sbin/php-fpm82 -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\n\nwith-contenv\nimportas -i PORT PORT\nif { echo "[INSTALL] 🚀 Starting app - navigate to your <server IP>:${PORT}" }\npython /home/pi/pialert/pialert' > /etc/s6-overlay/s6-rc.d/pialert/run
+echo -e '#!/bin/execlineb -P\n\nwith-contenv\nimportas -i PORT PORT\nif { echo "[INSTALL] 🚀 Starting app - navigate to your <server IP>:${PORT}" }' > /etc/s6-overlay/s6-rc.d/pialert/run
+echo -e "python ${INSTALL_DIR}/pialert/pialert" >> /etc/s6-overlay/s6-rc.d/pialert/run
 touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx}/dependencies.d/SetupOneshot
 touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,pialert} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx,pialert}/dependencies.d/SetupOneshot
 touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm