mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-01-10 09:51:02 +01:00
Update Dockerfile
This commit is contained in:
@@ -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 <<EOF /etc/nginx/conf.d/default.conf
|
||||
server {
|
||||
listen 3000; root /out/photos;
|
||||
location / { try_files \$uri \$uri.html /index.html; }
|
||||
}
|
||||
server {
|
||||
listen 3001; root /out/accounts;
|
||||
location / { try_files \$uri \$uri.html /index.html; }
|
||||
}
|
||||
server {
|
||||
listen 3002; root /out/photos;
|
||||
location / { try_files \$uri \$uri.html /index.html; }
|
||||
}
|
||||
server {
|
||||
listen 3003; root /out/auth;
|
||||
location / { try_files \$uri \$uri.html /index.html; }
|
||||
}
|
||||
server {
|
||||
listen 3004; root /out/cast;
|
||||
location / { try_files \$uri \$uri.html /index.html; }
|
||||
}
|
||||
EOF
|
||||
|
||||
# Environment variables for the web part
|
||||
ENV ENTE_API_ORIGIN=http://localhost:8080
|
||||
ENV ENTE_ALBUMS_ORIGIN=https://localhost:3002
|
||||
|
||||
# Script to replace environment variables in the JavaScript files
|
||||
RUN mkdir -p /docker-entrypoint.d
|
||||
COPY <<EOF /docker-entrypoint.d/90-replace-ente-env.sh
|
||||
#!/bin/sh
|
||||
find /out -name '*.js' |
|
||||
xargs sed -i'' "s#ENTE_API_ORIGIN_PLACEHOLDER#\$ENTE_API_ORIGIN#g"
|
||||
find /out/photos -name '*.js' |
|
||||
xargs sed -i'' "s#ENTE_ALBUMS_ORIGIN_PLACEHOLDER#\$ENTE_ALBUMS_ORIGIN#g"
|
||||
EOF
|
||||
RUN chmod +x /docker-entrypoint.d/90-replace-ente-env.sh
|
||||
postgresql postgresql-client
|
||||
|
||||
##################
|
||||
# 3 Install apps #
|
||||
##################
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
################
|
||||
# 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"
|
||||
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
|
||||
|
||||
ENTRYPOINT [ "/usr/bin/env" ]
|
||||
CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
# ---------- 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
|
||||
|
||||
############
|
||||
# 5 Labels #
|
||||
############
|
||||
@@ -152,6 +107,7 @@ LABEL \
|
||||
org.opencontainers.image.created=${BUILD_DATE} \
|
||||
org.opencontainers.image.revision=${BUILD_REF} \
|
||||
org.opencontainers.image.version=${BUILD_VERSION}
|
||||
|
||||
#################
|
||||
# 6 Finish line #
|
||||
#################
|
||||
|
||||
Reference in New Issue
Block a user