Align netalertx addon with test repository

netalertx/Dockerfile

@@ -10,38 +10,111 @@
 #               /`
 #=== Home Assistant Addon ===#
 
-#################
-# 1 Build Image #
-#################
+############################
+# 0) Tools stage (apk OK)  #
+############################
+# We build a tiny payload in /out containing:
+# - jq + its shared libs (libjq, libonig, etc.)
+# - gosu + its shared libs
+# IMPORTANT: we do NOT bring sudo to avoid breaking NetAlertX hardened behavior.
+FROM alpine:3.22 AS ha_tools
 
+RUN apk add --no-cache \
+    gosu \
+    pax-utils
+
+RUN set -eux; \
+    mkdir -p /out; \
+    for bin in /usr/bin/gosu; do \
+      mkdir -p "/out$(dirname "$bin")"; \
+      cp -a "$bin" "/out$bin"; \
+      # Copy runtime deps. Skip musl loader to avoid clobbering base image libc/loader.
+      lddtree -l "$bin" | while read -r dep; do \
+        case "$dep" in \
+          /lib/ld-musl-*.so.1) \
+            continue ;; \
+          /*) \
+            mkdir -p "/out$(dirname "$dep")"; \
+            cp -a "$dep" "/out$(dirname "$dep")/"; \
+            ;; \
+        esac; \
+      done; \
+    done
+
+##################
+# 1) Final image #
+##################
 ARG BUILD_FROM
-ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+FROM ghcr.io/jokob-sk/netalertx:latest
 
-##################
-# 2 Modify Image #
-##################
+# S6 settings (keep yours)
+ENV S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
-ENV NETALERTX_DATA=/config
-ENV READ_WRITE_FOLDERS="$READ_WRITE_FOLDERS $NETALERTX_DATA"
-
-##################
-# 3 Install apps #
-##################
+USER 0
 
 # Add rootfs
-COPY --chown=102:102 rootfs/ /
+COPY rootfs/ /
+
+# Bring in jq + gosu (and their libs). NO apk in final stage.
+COPY --from=ha_tools /out/ /
+
 RUN BASHIO_VERSION="0.14.3" && \
     mkdir -p /tmp/bashio && \
-    curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio
-    #mv /tmp/bashio/lib /usr/lib/bashio && \
-    #ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
-    #rm -rf /tmp/
+    curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio && \
+    mv /tmp/bashio/lib /usr/lib/bashio && \
+    ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
+    rm -rf /tmp/bashio
+
+ARG TARGETARCH
+RUN curl -L -o /usr/local/bin/jq "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-$TARGETARCH" && \
+    chmod +x /usr/local/bin/jq
+
+###########
+# Modules #
+###########
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh \
+    && /ha_automodules.sh "$MODULES" \
+    && rm /ha_automodules.sh
+
+#################
+# Manual apps   #
+#################
+ENV PACKAGES=""
+
+# Automatic apps & bashio
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh \
+    && /ha_autoapps.sh "$PACKAGES" \
+    && rm /ha_autoapps.sh
+
+################
+# 4 Entrypoint #
+################
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+
+# Entrypoint modifications
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh \
+    && /ha_entrypoint_modif.sh \
+    && rm /ha_entrypoint_modif.sh
+
+#WORKDIR /
+ENTRYPOINT [ "/usr/bin/env" ]
+CMD [ "/ha_entrypoint.sh" ]
+
+# Your preferred shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ############
 # 5 Labels #
 ############
-
 ARG BUILD_ARCH
 ARG BUILD_DATE
 ARG BUILD_DESCRIPTION
@@ -68,12 +141,3 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
-
-####################
-# 6 HealthcheckNOT #
-####################
-# # In the dockerfile Changing hard links if possible
-# RUN for folder in config db; do \
-#     echo "Adapting hard links" && \
-#     grep -rl "/app/$folder" / 2>/dev/null | xargs sed -i "s|/app/$folder|/config/$folder|g"; \
-# done