Merge pull request #64 from 0x5f3/bullseye

Upgrade base image to Debian Bullseye 

Great work, thanks!  🥇, I just have to adjust the gitignore after the merge - the user-mapping.sh is required
This commit is contained in:
jokob-sk
2022-08-05 10:18:38 +10:00
committed by GitHub
2 changed files with 23 additions and 3 deletions

19
.dockerignore Normal file
View File

@@ -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

View File

@@ -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/* \