From b0be559afc5b87a77249c8b3e8403c8f04ff4ac6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 16 Jul 2025 06:42:03 +0000 Subject: [PATCH] Revert 'try refactor' [nobuild] --- ente/Dockerfile | 133 +++++++++++++++++++++-------------------------- ente/config.json | 2 +- 2 files changed, 59 insertions(+), 76 deletions(-) diff --git a/ente/Dockerfile b/ente/Dockerfile index d6fd4a2ce..509ca2c6a 100644 --- a/ente/Dockerfile +++ b/ente/Dockerfile @@ -11,107 +11,89 @@ #=== Home Assistant Add‑on – ENTE ===# ################# -# 1 Base Image # +# 1 Build Image # ################# + ARG BUILD_VERSION FROM ghcr.io/ente-io/server:latest -######################### -# 2 S6 / base settings # -######################### -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 +################## +# 2 Modify Image # +################## + +# S6 settings +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 USER root -############################################# -# 3 LSIO helper patch (same pattern as you) # -############################################# +# LSIO helpers (same repo you already use) ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" ARG CONFIGLOCATION="/config" -RUN chmod 744 /ha_lsio.sh \ - && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi \ - && rm /ha_lsio.sh +RUN chmod 744 /ha_lsio.sh && \ + if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && \ + rm /ha_lsio.sh -######################################################## -# 4 Core packages + Postgres 17 server & client (apk) # -######################################################## -# NOTE: Ente base image is Alpine; use apk. We install bash for bashio scripts. -# Try to pull PG17 from edge; if unavailable fall back to distro default (may be lower major). +# ---------- MinIO & tools (needed by Ente) ---------- +# – server binary + client (`mc`) RUN set -eux; \ - apk update; \ - apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \ - bash curl ca-certificates wget jq sudo tzdata \ - postgresql17 postgresql17-client || \ - (echo "edge PG17 not available, falling back to distro postgresql"; \ - apk add --no-cache postgresql postgresql-client bash curl ca-certificates wget jq sudo tzdata); \ - # create /bin/bash symlink for scripts that expect it - ln -sf /usr/bin/bash /bin/bash - -################################### -# 5 MinIO server + CLI (per‑arch) # -################################### -# Detect arch at build time using Alpine uname. -ARG TARGETARCH -RUN set -eux; \ - arch="${TARGETARCH:-$(uname -m)}"; \ - case "$arch" in \ - amd64|x86_64) minio_arch="amd64" ;; \ - arm64|aarch64) minio_arch="arm64" ;; \ - *) minio_arch="amd64" ;; \ - esac; \ - curl -fsSL "https://dl.min.io/server/minio/release/linux-${minio_arch}/minio" -o /usr/local/bin/minio; \ - curl -fsSL "https://dl.min.io/client/mc/release/linux-${minio_arch}/mc" -o /usr/local/bin/mc; \ + apk add --no-cache \ + bash curl ca-certificates wget jq tini postgresql15-client; \ + curl -fsSL https://dl.min.io/server/minio/release/linux-amd64/minio -o /usr/local/bin/minio; \ + curl -fsSL https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/local/bin/mc; \ chmod +x /usr/local/bin/minio /usr/local/bin/mc -##################################################### -# 6 Ensure predictable paths for museum & ente‑web # -##################################################### -RUN set -eux; \ - MUSEUM_PATH="$(command -v museum || true)"; \ - if [ -n "$MUSEUM_PATH" ]; then ln -sf "$MUSEUM_PATH" /usr/bin/museum; fi; \ - WEB_PATH="$(command -v ente-web || true)"; \ - if [ -n "$WEB_PATH" ]; then ln -sf "$WEB_PATH" /usr/bin/ente-web; fi +RUN apk update && \ + apk add --no-cache \ + lsb-release curl gnupg wget tini jq sudo \ + postgresql postgresql-client + +# Put museum / web on a predictable path for your run-scripts +RUN ln -sf $(command -v museum) /usr/bin/museum && \ + ln -sf $(command -v ente-web) /usr/bin/ente-web ################## -# 7 Install apps # +# 3 Install apps # ################## -# Optional modules (same pattern as your other add‑ons) + +COPY rootfs/ / + +# bind‑compat for some addons +#RUN ln -sf /usr/bin/bash /bin/bash || true && \ +# ln -sf /usr/bin/sh /bin/sh || true + +# Optional modules (same pattern as ente) ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" 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 -# Optional extra packages via your helper +# Optional extra packages ENV PACKAGES="sudo jq yamllint" 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 ################ -# 8 Entrypoint # +# 4 Entrypoint # ################ -ENV S6_STAGE2_HOOK=/ha_entrypoint.sh + +ENV S6_STAGE2_HOOK=/ha_entrypoint.sh ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" 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 +RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && \ + /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh -############################ -# 9 Copy add‑on rootfs tree # -############################ -# (bashio‑aware cont‑init.d + services.d scripts) -COPY rootfs/ / +ENTRYPOINT [ "/usr/bin/env" ] +CMD [ "/ha_entrypoint.sh" ] -########################################## -# 10 Healthcheck (museum exposes /ping) # -########################################## -ENV HEALTH_PORT="8080" \ - HEALTH_URL="/ping" -HEALTHCHECK --interval=10s --retries=5 --timeout=20s CMD \ - curl -A "HealthCheck: Docker/1.0" -fs "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" || exit 1 +# ---------- Healthcheck ---------- +#ENV HEALTH_PORT="8080" \ +# HEALTH_URL="/ping" +#HEALTHCHECK --interval=10s --retries=5 --timeout=20s CMD \ +# curl -A "HealthCheck: Docker/1.0" -fs "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" || exit 1 ############ -# 11 Labels # +# 5 Labels # ############ ARG BUILD_ARCH BUILD_DATE BUILD_NAME BUILD_DESCRIPTION BUILD_REF BUILD_REPOSITORY LABEL \ @@ -119,18 +101,19 @@ LABEL \ io.hass.description="${BUILD_DESCRIPTION}" \ io.hass.arch="${BUILD_ARCH}" \ io.hass.type="addon" \ - io.hass.version="${BUILD_VERSION}" \ + io.hass.version=${BUILD_VERSION} \ maintainer="alexbelgium (https://github.com/alexbelgium)" \ org.opencontainers.image.title="${BUILD_NAME}" \ org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ org.opencontainers.image.url="https://github.com/alexbelgium" \ org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created="${BUILD_DATE}" \ - org.opencontainers.image.revision="${BUILD_REF}" \ - org.opencontainers.image.version="${BUILD_VERSION}" + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} ################# -# 12 Finish line# +# 6 Finish line # ################# -# S6 supervises internal services; no CMD override. +# S6 will pick up run scripts from /etc/services.d supplied in rootfs +# and launch: › minio › museum API › (optional) web‑UI diff --git a/ente/config.json b/ente/config.json index f7ad2a9bc..d2a261aa0 100644 --- a/ente/config.json +++ b/ente/config.json @@ -77,7 +77,7 @@ "startup": "services", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.0.0test4", + "version": "1.0.0test3", "video": true, "webui": "http://[HOST]:[PORT:3000]" }