From 3d904cbd31197171865c772c19bf77ea6970b572 Mon Sep 17 00:00:00 2001
From: Macleykun <wesley.de.vree@gmail.com>
Date: Sun, 12 Jun 2022 15:43:16 +0200
Subject: [PATCH] revert again clean a litle up

---
 Dockerfile | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f13eeb97..2cd16e09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,35 +1,27 @@
 FROM debian:buster-slim
 
-WORKDIR /home/pi/pialert/
-
-#Update and reduce image size
 RUN apt-get update \
-    && apt-get install --no-install-recommends apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python iproute2 -y \
-    #Install without the --no-install-recommends flag
-    && apt-get install curl arp-scan -y \
-    #clean-up
+    && apt-get install --no-install-recommends curl arp-scan apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python iproute2 -y \
     && apt-get clean autoclean \
     && apt-get autoremove \
     && rm -rf /var/lib/apt/lists/*
 
-
 # Lighttpd & PHP
 RUN mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.html.old \
-    && ln -s install/index.html /var/www/html/index.html \
+    && ln -s /home/pi/pialert/install/index.html /var/www/html/index.html \
     && lighttpd-enable-mod fastcgi-php 
 
 COPY . /home/pi/pialert
 
 # delete .git/ files and the tar/ realese directory to make the image smaller
-#RUN rm -r .git \
-RUN rm -r tar 
+RUN rm -r /home/pi/pialert/tar 
 
 # Pi.Alert   
-RUN ln -s front /var/www/html/pialert  \
-    && python back/pialert.py update_vendors \    
-    && (crontab -l 2>/dev/null; cat install/pialert.cron) | crontab - \
-    && chgrp -R www-data db \
-    && chmod -R 770 db \
+RUN ln -s /home/pi/pialert/front /var/www/html/pialert  \
+    && python /home/pi/pialert/back/pialert.py update_vendors \    
+    && (crontab -l 2>/dev/null; cat /home/pi/pialert/install/pialert.cron) | crontab - \
+    && chgrp -R www-data /home/pi/pialert/db \
+    && chmod -R 770 /home/pi/pialert/db \
     # changing the default port number 80 to something random, here 20211
     && sed -ie 's/= 80/= 20211/g' /etc/lighttpd/lighttpd.conf \
     && service lighttpd restart 
@@ -38,6 +30,6 @@ RUN ln -s front /var/www/html/pialert  \
 EXPOSE 20211
 
 # Set up startup script to run two commands, cron and the lighttpd server
-RUN chmod +x dockerfiles/start.sh
+RUN chmod +x /home/pi/pialert/dockerfiles/start.sh
 
-CMD ["dockerfiles/start.sh"]
+CMD ["/home/pi/pialert/dockerfiles/start.sh"]