Fix Ente Cloudron packaging issues
- Fixed admin-helper.sh to use correct Museum binary path (/app/museum-bin/museum) - Updated start.sh to handle missing S3 configuration gracefully - App now starts in configuration mode when S3 is not configured - Shows helpful configuration page instead of failing health checks - Properly starts Museum server once S3 is configured - Updated CloudronManifest.json to version 0.2.2 - All web frontends (photos, accounts, auth, cast, albums, family) verified working - Museum API server running successfully with S3 storage
This commit is contained in:
248
Dockerfile
248
Dockerfile
@@ -1,188 +1,110 @@
|
||||
# Build Museum server from source
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
ARG ENTE_GIT_REF=main
|
||||
|
||||
FROM debian:bookworm AS ente-source
|
||||
ARG ENTE_GIT_REF
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends ca-certificates git && \
|
||||
git clone --depth=1 --branch "${ENTE_GIT_REF}" https://github.com/ente-io/ente.git /src && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
FROM golang:1.24-bookworm AS museum-builder
|
||||
|
||||
WORKDIR /ente
|
||||
|
||||
# Clone the repository for server building
|
||||
RUN apt-get update && apt-get install -y git libsodium-dev && \
|
||||
git clone --depth=1 https://github.com/ente-io/ente.git . && \
|
||||
apt-get clean && apt-get autoremove && \
|
||||
rm -rf /var/cache/apt /var/lib/apt/lists
|
||||
|
||||
# Build the Museum server
|
||||
COPY --from=ente-source /src /ente
|
||||
WORKDIR /ente/server
|
||||
RUN go mod download && \
|
||||
CGO_ENABLED=1 GOOS=linux go build -a -o museum ./cmd/museum
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends build-essential pkg-config libsodium-dev && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
RUN mkdir -p /build/museum && \
|
||||
CGO_ENABLED=1 GOOS=linux go build -o /build/museum/museum ./cmd/museum && \
|
||||
for dir in migrations web-templates mail-templates assets; do \
|
||||
rm -rf "/build/museum/$dir"; \
|
||||
if [ -d "$dir" ]; then \
|
||||
cp -r "$dir" "/build/museum/$dir"; \
|
||||
else \
|
||||
mkdir -p "/build/museum/$dir"; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
FROM node:20-bookworm-slim as web-builder
|
||||
FROM golang:1.24-bookworm AS cli-builder
|
||||
COPY --from=ente-source /src /ente
|
||||
WORKDIR /ente/cli
|
||||
RUN go build -o /build/ente .
|
||||
|
||||
WORKDIR /ente
|
||||
|
||||
# Clone the repository for web app building
|
||||
RUN apt-get update && apt-get install -y git && \
|
||||
git clone --depth=1 https://github.com/ente-io/ente.git . && \
|
||||
apt-get clean && apt-get autoremove && \
|
||||
rm -rf /var/cache/apt /var/lib/apt/lists
|
||||
|
||||
# Will help default to yarn version 1.22.22
|
||||
FROM node:20-bookworm-slim AS web-builder
|
||||
ENV NEXT_PUBLIC_ENTE_ENDPOINT=ENTE_API_ORIGIN_PLACEHOLDER
|
||||
COPY --from=ente-source /src /ente
|
||||
WORKDIR /ente/web
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends build-essential python3 && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
RUN corepack enable
|
||||
|
||||
# Set environment variables for web app build - use relative endpoint
|
||||
ENV NEXT_PUBLIC_ENTE_ENDPOINT="/api"
|
||||
RUN echo "Building with relative NEXT_PUBLIC_ENTE_ENDPOINT=/api for self-hosted deployment"
|
||||
|
||||
# Debugging the repository structure
|
||||
RUN find . -type d -maxdepth 3 | sort
|
||||
|
||||
# Check if web directory exists with apps subdirectory
|
||||
RUN mkdir -p /build/web/photos /build/web/accounts /build/web/auth /build/web/cast && \
|
||||
if [ -d "web" ] && [ -d "web/apps" ]; then \
|
||||
echo "Found web/apps directory, building web apps"; \
|
||||
cd web && \
|
||||
yarn cache clean && \
|
||||
yarn install --network-timeout 1000000000 && \
|
||||
yarn build:photos && \
|
||||
yarn build:accounts && \
|
||||
yarn build:auth && \
|
||||
yarn build:cast && \
|
||||
if [ -d "apps/photos/out" ]; then \
|
||||
cp -r apps/photos/out/* /build/web/photos/; \
|
||||
fi && \
|
||||
if [ -d "apps/accounts/out" ]; then \
|
||||
cp -r apps/accounts/out/* /build/web/accounts/; \
|
||||
fi && \
|
||||
if [ -d "apps/auth/out" ]; then \
|
||||
cp -r apps/auth/out/* /build/web/auth/; \
|
||||
fi && \
|
||||
if [ -d "apps/cast/out" ]; then \
|
||||
cp -r apps/cast/out/* /build/web/cast/; \
|
||||
fi; \
|
||||
elif [ -d "web" ]; then \
|
||||
echo "Found web directory, looking for alternative structure"; \
|
||||
find web -type d | grep -v node_modules | sort; \
|
||||
if [ -d "web/photos" ]; then \
|
||||
echo "Building photos app"; \
|
||||
cd web/photos && yarn install && yarn build && \
|
||||
if [ -d "out" ]; then cp -r out/* /build/web/photos/; fi; \
|
||||
fi; \
|
||||
if [ -d "web/accounts" ]; then \
|
||||
echo "Building accounts app"; \
|
||||
cd web/accounts && yarn install && yarn build && \
|
||||
if [ -d "out" ]; then cp -r out/* /build/web/accounts/; fi; \
|
||||
fi; \
|
||||
if [ -d "web/auth" ]; then \
|
||||
echo "Building auth app"; \
|
||||
cd web/auth && yarn install && yarn build && \
|
||||
if [ -d "out" ]; then cp -r out/* /build/web/auth/; fi; \
|
||||
fi; \
|
||||
if [ -d "web/cast" ]; then \
|
||||
echo "Building cast app"; \
|
||||
cd web/cast && yarn install && yarn build && \
|
||||
if [ -d "out" ]; then cp -r out/* /build/web/cast/; fi; \
|
||||
RUN yarn install --network-timeout 1000000
|
||||
RUN mkdir -p /build/web/photos /build/web/accounts /build/web/auth /build/web/cast /build/web/albums /build/web/family
|
||||
RUN set -e; \
|
||||
yarn build:photos; \
|
||||
yarn build:accounts; \
|
||||
yarn build:auth; \
|
||||
yarn build:cast
|
||||
RUN if [ -d "apps" ]; then \
|
||||
for app in photos accounts auth cast; do \
|
||||
if [ -d "apps/${app}/out" ]; then \
|
||||
rm -rf "/build/web/${app}"; \
|
||||
mkdir -p "/build/web/${app}"; \
|
||||
cp -r "apps/${app}/out/." "/build/web/${app}/"; \
|
||||
else \
|
||||
printf 'Missing build output for %s\n' "${app}"; \
|
||||
printf '<html><body><h1>Ente %s</h1><p>Build output missing.</p></body></html>\n' "${app}" > "/build/web/${app}/index.html"; \
|
||||
fi; \
|
||||
done; \
|
||||
else \
|
||||
echo "Web directory not found, creating placeholder web pages"; \
|
||||
# Create placeholder HTML files for each app \
|
||||
mkdir -p /build/web/photos /build/web/accounts /build/web/auth /build/web/cast; \
|
||||
echo "<html><body><h1>Ente Photos</h1><p>Web app not available. Please check the build logs.</p></body></html>" > /build/web/photos/index.html; \
|
||||
echo "<html><body><h1>Ente Accounts</h1><p>Web app not available. Please check the build logs.</p></body></html>" > /build/web/accounts/index.html; \
|
||||
echo "<html><body><h1>Ente Auth</h1><p>Web app not available. Please check the build logs.</p></body></html>" > /build/web/auth/index.html; \
|
||||
echo "<html><body><h1>Ente Cast</h1><p>Web app not available. Please check the build logs.</p></body></html>" > /build/web/cast/index.html; \
|
||||
fi
|
||||
for app in photos accounts auth cast; do \
|
||||
printf '<html><body><h1>Ente %s</h1><p>Build output missing.</p></body></html>\n' "${app}" > "/build/web/${app}/index.html"; \
|
||||
done; \
|
||||
fi && \
|
||||
rm -rf /build/web/albums /build/web/family && \
|
||||
cp -r /build/web/photos /build/web/albums && \
|
||||
cp -r /build/web/photos /build/web/family
|
||||
|
||||
FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
|
||||
|
||||
# Install necessary packages and Caddy webserver
|
||||
ENV APP_DIR=/app/code \
|
||||
DATA_DIR=/app/data \
|
||||
HOME=/app/data/home
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y curl git nodejs npm libsodium23 libsodium-dev pkg-config postgresql-client && \
|
||||
npm install -g yarn serve && \
|
||||
# Install Caddy for web server
|
||||
apt-get install -y debian-keyring debian-archive-keyring apt-transport-https && \
|
||||
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
|
||||
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list && \
|
||||
apt-get update && \
|
||||
apt-get install -y caddy && \
|
||||
apt-get clean && apt-get autoremove && \
|
||||
rm -rf /var/cache/apt /var/lib/apt/lists
|
||||
apt-get install -y --no-install-recommends ca-certificates curl jq libsodium23 pkg-config postgresql-client caddy openssl && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Go 1.24.1
|
||||
RUN curl -L https://go.dev/dl/go1.24.1.linux-amd64.tar.gz -o go.tar.gz && \
|
||||
rm -rf /usr/local/go && \
|
||||
tar -C /usr/local -xzf go.tar.gz && \
|
||||
rm go.tar.gz && \
|
||||
ln -sf /usr/local/go/bin/go /usr/local/bin/go && \
|
||||
ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
|
||||
RUN mkdir -p /app/pkg /app/web "$HOME" && chown -R cloudron:cloudron /app /app/web "$HOME"
|
||||
|
||||
# Set up directory structure
|
||||
RUN mkdir -p /app/code /app/data/config /app/data/caddy /app/web
|
||||
COPY --from=ente-source /src ${APP_DIR}
|
||||
RUN rm -rf ${APP_DIR}/.git
|
||||
|
||||
WORKDIR /app/code
|
||||
RUN mkdir -p /app/museum-bin
|
||||
COPY --from=museum-builder /build/museum/museum /app/museum-bin/museum
|
||||
COPY --from=museum-builder /build/museum/migrations ${APP_DIR}/server/migrations
|
||||
COPY --from=museum-builder /build/museum/web-templates ${APP_DIR}/server/web-templates
|
||||
COPY --from=museum-builder /build/museum/mail-templates ${APP_DIR}/server/mail-templates
|
||||
COPY --from=museum-builder /build/museum/assets ${APP_DIR}/server/assets
|
||||
RUN chmod +x /app/museum-bin/museum
|
||||
|
||||
# Clone the ente repository during build (for the Museum server)
|
||||
RUN git clone --depth=1 https://github.com/ente-io/ente.git . && \
|
||||
sed -i 's/go 1.23/go 1.24/' server/go.mod && \
|
||||
mkdir -p /app/data/go && \
|
||||
cp -r server/go.mod server/go.sum /app/data/go/ && \
|
||||
chmod 777 /app/data/go/go.mod /app/data/go/go.sum
|
||||
COPY --from=cli-builder /build/ente /app/code/ente
|
||||
RUN ln -sf /app/code/ente /usr/local/bin/ente && chmod +x /app/code/ente
|
||||
|
||||
# Pre-download Go dependencies
|
||||
RUN cd server && \
|
||||
export GOMODCACHE="/app/data/go/pkg/mod" && \
|
||||
export GOFLAGS="-modfile=/app/data/go/go.mod -mod=mod" && \
|
||||
export GOTOOLCHAIN=local && \
|
||||
export GO111MODULE=on && \
|
||||
export GOSUMDB=off && \
|
||||
mkdir -p /app/data/go/pkg/mod && \
|
||||
chmod -R 777 /app/data/go && \
|
||||
go mod download
|
||||
|
||||
# Set Go environment variables
|
||||
ENV GOTOOLCHAIN=local
|
||||
ENV GO111MODULE=on
|
||||
ENV GOFLAGS="-modfile=/app/data/go/go.mod -mod=mod"
|
||||
ENV PATH="/usr/local/go/bin:${PATH}"
|
||||
ENV GOSUMDB=off
|
||||
ENV GOMODCACHE="/app/data/go/pkg/mod"
|
||||
ENV HOME=/app/data/home
|
||||
|
||||
# Copy the web app built files from the first stage
|
||||
COPY --from=web-builder /build/web/photos /app/web/photos
|
||||
COPY --from=web-builder /build/web/accounts /app/web/accounts
|
||||
COPY --from=web-builder /build/web/auth /app/web/auth
|
||||
COPY --from=web-builder /build/web/cast /app/web/cast
|
||||
COPY --from=web-builder /build/web/albums /app/web/albums
|
||||
COPY --from=web-builder /build/web/family /app/web/family
|
||||
|
||||
# Build Ente CLI and place binary in /app/code
|
||||
WORKDIR /app/code/cli
|
||||
RUN env GOFLAGS= GOMODCACHE=/tmp/cli-go-cache GO111MODULE=on go build -o /app/code/ente . && chmod +x /app/code/ente
|
||||
COPY start.sh /app/pkg/start.sh
|
||||
COPY admin-helper.sh /app/pkg/admin-helper.sh
|
||||
COPY admin-helper-direct.sh /app/pkg/admin-helper-direct.sh
|
||||
|
||||
WORKDIR /app/code
|
||||
|
||||
# Symlink CLI into PATH for convenience
|
||||
RUN ln -sf /app/code/ente /usr/local/bin/ente
|
||||
|
||||
# Prepare CLI data directory symlink to persistent storage
|
||||
RUN mkdir -p /app/data/cli-data && ln -s /app/data/cli-data /cli-data
|
||||
|
||||
# Copy Museum server binary from builder stage to app directory (not data volume)
|
||||
RUN mkdir -p /app/museum-bin
|
||||
COPY --from=museum-builder /ente/server/museum /app/museum-bin/museum
|
||||
RUN chmod +x /app/museum-bin/museum
|
||||
|
||||
# Copy configuration and startup scripts
|
||||
ADD start.sh /app/pkg/
|
||||
ADD config.template.yaml /app/pkg/
|
||||
ADD otp-email-monitor.js /app/pkg/
|
||||
ADD package.json /app/pkg/
|
||||
ADD admin-helper.sh /app/pkg/
|
||||
ADD admin-helper-direct.sh /app/pkg/
|
||||
|
||||
# Set proper permissions
|
||||
RUN chmod +x /app/pkg/start.sh /app/pkg/admin-helper.sh /app/pkg/admin-helper-direct.sh
|
||||
|
||||
# Expose the web port (Cloudron expects port 3080)
|
||||
EXPOSE 3080
|
||||
# Also expose API port
|
||||
EXPOSE 8080
|
||||
EXPOSE 3080 8080
|
||||
|
||||
# Start the application
|
||||
CMD ["/app/pkg/start.sh"]
|
||||
CMD ["/app/pkg/start.sh"]
|
||||
|
||||
Reference in New Issue
Block a user