cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove arg and start a little safer this time

Browse Source
This commit is contained in:
Macleykun
2022-06-12 15:33:39 +02:00
parent 5f5cc13d1a
commit 3a39d9d6e2
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Dockerfile
View File

@@ -1,7 +1,5 @@
FROM debian:buster-slim FROM debian:buster-slim
ARG dir="/home/pi/pialert"
#Update and reduce image size #Update and reduce image size
RUN apt-get update \ 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 \ && 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 \
@@ -15,21 +13,21 @@ RUN apt-get update \
# Lighttpd & PHP # Lighttpd & PHP
RUN mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.html.old \ RUN mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.html.old \
&& ln -s $dir/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 && lighttpd-enable-mod fastcgi-php
COPY . $dir COPY . /home/pi/pialert
# delete .git/ files and the tar/ realese directory to make the image smaller # delete .git/ files and the tar/ realese directory to make the image smaller
#RUN rm -r $dir/.git \ #RUN rm -r /home/pi/pialert/.git \
RUN rm -r $dir/tar RUN rm -r /home/pi/pialert/tar
# Pi.Alert # Pi.Alert
RUN ln -s $dir/front /var/www/html/pialert \ RUN ln -s /home/pi/pialert/front /var/www/html/pialert \
&& python $dir/back/pialert.py update_vendors \ && python /home/pi/pialert/back/pialert.py update_vendors \
&& (crontab -l 2>/dev/null; cat $dir/install/pialert.cron) | crontab - \ && (crontab -l 2>/dev/null; cat /home/pi/pialert/install/pialert.cron) | crontab - \
&& chgrp -R www-data $dir/db \ && chgrp -R www-data /home/pi/pialert/db \
&& chmod -R 770 $dir/db \ && chmod -R 770 /home/pi/pialert/db \
# changing the default port number 80 to something random, here 20211 # changing the default port number 80 to something random, here 20211
&& sed -ie 's/= 80/= 20211/g' /etc/lighttpd/lighttpd.conf \ && sed -ie 's/= 80/= 20211/g' /etc/lighttpd/lighttpd.conf \
&& service lighttpd restart && service lighttpd restart
@@ -38,6 +36,6 @@ RUN ln -s $dir/front /var/www/html/pialert \
EXPOSE 20211 EXPOSE 20211
# Set up startup script to run two commands, cron and the lighttpd server # Set up startup script to run two commands, cron and the lighttpd server
RUN chmod +x $dir/dockerfiles/start.sh RUN chmod +x /home/pi/pialert/dockerfiles/start.sh
CMD ["/home/pi/pialert/dockerfiles/start.sh"] CMD ["/home/pi/pialert/dockerfiles/start.sh"]