diff --git a/ente/Dockerfile b/ente/Dockerfile index f63100cea..4b8c94e63 100644 --- a/ente/Dockerfile +++ b/ente/Dockerfile @@ -9,42 +9,32 @@ # d '---` .-'""` # /` #=== Home Assistant Add‑on – ENTE ===# + ################# # 1 Build Image # ################# + ARG BUILD_VERSION - -# Stage 1: Build the web part -FROM node:22-alpine AS builder -WORKDIR /build -COPY . . -ENV NEXT_PUBLIC_ENTE_ENDPOINT=ENTE_API_ORIGIN_PLACEHOLDER -ENV NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=ENTE_ALBUMS_ORIGIN_PLACEHOLDER -# `yarn install` is flaky on the GitHub arm64 runners otherwise. -RUN yarn config set network-timeout 900000 -g -RUN yarn install -RUN yarn build:photos -RUN yarn build:accounts -RUN yarn build:auth -RUN yarn build:cast - -# Stage 2: Final image with both server and web parts FROM ghcr.io/ente-io/server:latest ################## # 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 + # 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 + # ---------- MinIO & tools (needed by Ente) ---------- # – server binary + client (`mc`) RUN set -eux; \ @@ -53,86 +43,51 @@ RUN set -eux; \ 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 + RUN apk update && \ apk add --no-cache \ lsb-release curl gnupg wget tini jq sudo \ - postgresql postgresql-client nginx - -# Copy the built web part from the builder stage -COPY --from=builder /build/apps/photos/out /out/photos -COPY --from=builder /build/apps/accounts/out /out/accounts -COPY --from=builder /build/apps/auth/out /out/auth -COPY --from=builder /build/apps/cast/out /out/cast - -# Configure Nginx -COPY <