alpine re-base cleanup 🧹

This commit is contained in:
Jokob-sk
2024-03-02 10:06:32 +11:00
parent ca2df744df
commit 2362622cd0
6 changed files with 8 additions and 8 deletions

View File

@@ -47,7 +47,7 @@ COPY --from=builder --chown=nginx:www-data ${INSTALL_DIR}/pialert/ ${INSTALL_DIR
RUN /home/pi/pialert/dockerfiles/pre-setup.sh
HEALTHCHECK --interval=30s --timeout=5s --start-period=0s --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
ENTRYPOINT ["/init"]

View File

@@ -26,7 +26,7 @@ RUN groupadd --gid "${USER_GID}" "${USER}" && \
COPY --chmod=775 --chown=${USER_ID}:${USER_GID} . /home/pi/pialert/
# ❗ 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.debian.sh file as well ❗
RUN apt-get install -y \
tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \
@@ -45,6 +45,6 @@ RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /us
# Create a buildtimestamp.txt to later check if a new version was released
RUN date +%s > /home/pi/pialert/front/buildtimestamp.txt
CMD ["/home/pi/pialert/dockerfiles/start.debian.sh"]
CMD ["/home/pi/pialert/install/start.debian.sh"]

View File

@@ -32,7 +32,7 @@ services:
- ${DEV_LOCATION}/back/update_vendors.sh:/home/pi/pialert/back/update_vendors.sh
- ${DEV_LOCATION}/front/lib/AdminLTE:/home/pi/pialert/front/lib/AdminLTE
- ${DEV_LOCATION}/front/js:/home/pi/pialert/front/js
- ${DEV_LOCATION}/dockerfiles/start.debian.sh:/home/pi/pialert/dockerfiles/start.debian.sh
- ${DEV_LOCATION}/install/start.debian.sh:/home/pi/pialert/install/start.debian.sh
- ${DEV_LOCATION}/dockerfiles/user-mapping.sh:/home/pi/pialert/dockerfiles/user-mapping.sh
- ${DEV_LOCATION}/install/install.debian.sh:/home/pi/pialert/install/install.debian.sh
- ${DEV_LOCATION}/install/install_dependencies.debian.sh:/home/pi/pialert/install/install_dependencies.debian.sh

View File

@@ -27,7 +27,7 @@ Some facts about what and where something will be changed/installed by the HW in
## Limitations
- No system service is provided. PiAlert must be started using `/home/pi/pialert/dockerfiles/start.debian.sh`.
- No system service is provided. PiAlert must be started using `/home/pi/pialert/install/start.debian.sh`.
- No checks for other running software is done.
- Only tested to work on Debian Bookworm (Debian 12).
- **EXPERIMENTAL** and not recommended way to install PiAlert.

View File

@@ -1,10 +1,10 @@
#!/usr/bin/env bash
# 🛑 Important: This is only used for the bare-metal install 🛑
# Update /dockerfiles/start.debian.sh in most cases is preferred
# Update /install/start.debian.sh in most cases is preferred
echo "---------------------------------------------------------"
echo "[INSTALL] Run install.sh"
echo "[INSTALL] Run install.debian.sh"
echo "---------------------------------------------------------"
# Set environment variables
@@ -35,4 +35,4 @@ if [ ! -f $INSTALL_DIR/pialert/front/buildtimestamp.txt ]; then
fi
# Start PiAlert
"$INSTALL_DIR/pialert/dockerfiles/start.debian.sh"
"$INSTALL_DIR/pialert/install/start.debian.sh"