mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-07-03 12:38:46 +02:00
Align Ente addon Dockerfile with upstream web Dockerfile
- Upgrade Node from 22 to 24 - Switch from Yarn to npm (npm ci / npm run build:*) - Remove wasm-pack, corepack, python3, pkg-config - Add all 10 upstream build targets (albums, share, embed, paste, locker, memories) - Remove NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT env var - Use upstream rustup flags
This commit is contained in:
committed by
GitHub
parent
ffdf9fa239
commit
ea9f19ea80
@@ -6,7 +6,7 @@
|
|||||||
########################################################
|
########################################################
|
||||||
# 0) Build the ente-web static front-end (multi-stage) #
|
# 0) Build the ente-web static front-end (multi-stage) #
|
||||||
########################################################
|
########################################################
|
||||||
FROM node:22-bookworm-slim AS web-builder
|
FROM node:24 AS web-builder
|
||||||
|
|
||||||
# Build-time selector; set `--build-arg ENTE_WEB_TAG=vX.Y.Z` if you want a specific release
|
# Build-time selector; set `--build-arg ENTE_WEB_TAG=vX.Y.Z` if you want a specific release
|
||||||
ARG ENTE_WEB_TAG=main
|
ARG ENTE_WEB_TAG=main
|
||||||
@@ -15,7 +15,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
|
|||||||
CARGO_HOME=/usr/local/cargo \
|
CARGO_HOME=/usr/local/cargo \
|
||||||
PATH=/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
PATH=/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
|
|
||||||
# Tools needed to build (git, rust, wasm-pack, yarn classic)
|
# Tools needed to build (git, rust for ente-wasm)
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
@@ -23,17 +23,10 @@ RUN set -eux; \
|
|||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
build-essential \
|
build-essential \
|
||||||
pkg-config \
|
|
||||||
python3 \
|
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
\
|
\
|
||||||
curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; \
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --target wasm32-unknown-unknown
|
||||||
rustup target add wasm32-unknown-unknown; \
|
|
||||||
\
|
|
||||||
corepack enable; \
|
|
||||||
corepack prepare yarn@1.22.22 --activate; \
|
|
||||||
npm install -g wasm-pack@0.13.1
|
|
||||||
|
|
||||||
# Pull the web source
|
# Pull the web source
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
@@ -41,16 +34,19 @@ RUN git clone --depth 1 --branch "${ENTE_WEB_TAG}" https://github.com/ente-io/en
|
|||||||
|
|
||||||
# Build web workspace (lives in ./web)
|
# Build web workspace (lives in ./web)
|
||||||
WORKDIR /src/web
|
WORKDIR /src/web
|
||||||
ENV NEXT_PUBLIC_ENTE_ENDPOINT=ENTE_API_ORIGIN_PLACEHOLDER \
|
ENV NEXT_PUBLIC_ENTE_ENDPOINT=ENTE_API_ORIGIN_PLACEHOLDER
|
||||||
NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=ENTE_ALBUMS_ORIGIN_PLACEHOLDER
|
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN npm ci
|
||||||
yarn config set network-timeout 900000 -g; \
|
RUN npm run build:photos
|
||||||
yarn install --frozen-lockfile; \
|
RUN npm run build:albums
|
||||||
yarn build:photos; \
|
RUN npm run build:accounts
|
||||||
yarn build:accounts; \
|
RUN npm run build:auth
|
||||||
yarn build:auth; \
|
RUN npm run build:cast
|
||||||
yarn build:cast
|
RUN npm run build:share
|
||||||
|
RUN npm run build:embed
|
||||||
|
RUN npm run build:paste
|
||||||
|
RUN npm run build:locker
|
||||||
|
RUN npm run build:memories
|
||||||
|
|
||||||
#################
|
#################
|
||||||
# 1) Base image #
|
# 1) Base image #
|
||||||
@@ -94,9 +90,15 @@ RUN apk add --no-cache nginx
|
|||||||
|
|
||||||
# Static files built in the previous stage
|
# Static files built in the previous stage
|
||||||
COPY --from=web-builder /src/web/apps/photos/out /www/photos
|
COPY --from=web-builder /src/web/apps/photos/out /www/photos
|
||||||
|
COPY --from=web-builder /src/web/apps/albums/out /www/albums
|
||||||
COPY --from=web-builder /src/web/apps/accounts/out /www/accounts
|
COPY --from=web-builder /src/web/apps/accounts/out /www/accounts
|
||||||
COPY --from=web-builder /src/web/apps/auth/out /www/auth
|
COPY --from=web-builder /src/web/apps/auth/out /www/auth
|
||||||
COPY --from=web-builder /src/web/apps/cast/out /www/cast
|
COPY --from=web-builder /src/web/apps/cast/out /www/cast
|
||||||
|
COPY --from=web-builder /src/web/apps/share/out /www/share
|
||||||
|
COPY --from=web-builder /src/web/apps/embed/out /www/embed
|
||||||
|
COPY --from=web-builder /src/web/apps/paste/out /www/paste
|
||||||
|
COPY --from=web-builder /src/web/apps/locker/out /www/locker
|
||||||
|
COPY --from=web-builder /src/web/apps/memories/out /www/memories
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# 3) Install add-on helpers #
|
# 3) Install add-on helpers #
|
||||||
|
|||||||
Reference in New Issue
Block a user