From e1f09261591821a5591e5fac61e79aeb66b52b7b Mon Sep 17 00:00:00 2001 From: 0x5f3 <104367919+0x5f3@users.noreply.github.com> Date: Wed, 3 Aug 2022 11:07:53 +0000 Subject: [PATCH 1/3] Debian Bullseye --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd17f6c6..7e491268 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim # default UID and GID ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211 @@ -7,8 +7,9 @@ ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211 # Todo, do we still need all these packages? I can already see sudo which isn't needed RUN apt-get update \ - && apt-get install --no-install-recommends ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python iproute2 nmap python-pip zip -y \ - && pip install requests \ + && apt-get install --no-install-recommends ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python3 iproute2 nmap python3-pip zip -y \ + && pip3 install requests \ + && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/apt/lists/* \ From 62c90aadf8c8c4ca0ef008d97dca76281363e799 Mon Sep 17 00:00:00 2001 From: "((void*)0)" <104367919+0x5f3@users.noreply.github.com> Date: Wed, 3 Aug 2022 11:09:35 +0000 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e491268..d594ce6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211 RUN apt-get update \ && apt-get install --no-install-recommends ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python3 iproute2 nmap python3-pip zip -y \ && pip3 install requests \ - && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \ + && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/apt/lists/* \ From ce7182a0e71a7511bd1567d422ecbd61e8d1457e Mon Sep 17 00:00:00 2001 From: "((void*)0)" <104367919+0x5f3@users.noreply.github.com> Date: Thu, 4 Aug 2022 12:28:14 +0000 Subject: [PATCH 3/3] Create .dockerignore --- .dockerignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..cc9efd12 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,19 @@ +.dockerignore +.env +.git +.github +.gitignore +docker-compose.yml +Dockerfile +dockerfiles/LICENSE +dockerfiles/README.md +dockerfiles/user-mapping.sh +docs +install/pialert_install.sh +install/pialert_install_no_webserver.sh +install/pialert_patch_DB.sh +install/pialert_uninstall.sh +install/pialert_update.sh +LICENSE.txt +README.md +tar