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

removing unneeded package, small tweaks

Browse Source
This commit is contained in:
root
2024-03-02 01:41:03 +00:00
parent 0126e448cc
commit 9ac0163f20
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.dockerignore
View File

@@ -5,9 +5,16 @@
.gitignore .gitignore
docker-compose.yml docker-compose.yml
Dockerfile Dockerfile
Dockerfile.debian
dockerfiles/LICENSE dockerfiles/LICENSE
dockerfiles/README.md dockerfiles/README.md
dockerfiles/README_ES.md
docs docs
LICENSE.txt LICENSE.txt
README.md README.md
CONTRIBUTING CONTRIBUTING
FUNDING.yml
config/.gitignore
db/.gitignore
pialert/README.md
pialert/README_ES.md

4
Dockerfile
View File

@@ -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 ❗ # ❗ IMPORTANT - if you modify this file modify the /install/install_dependecies.sh file as well ❗
RUN apk update --no-cache \ 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 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 sqlite php82 php82-fpm php82-cgi php82-curl php82-sqlite3 php82-session \
&& apk add --no-cache python3 nginx \ && 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/ 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 \ HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=2 \
CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/api/app_state.json CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/api/app_state.json

2
dockerfiles/pre-setup.sh
View File

@@ -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/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/nginx/dependencies.d/php-fpm
touch /etc/s6-overlay/s6-rc.d/pialert/dependencies.d/nginx touch /etc/s6-overlay/s6-rc.d/pialert/dependencies.d/nginx
rm -f $0