From b38bd6a249b188f05c3fb8aefa69d977bc401530 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 29 Sep 2025 22:05:24 -0600 Subject: [PATCH] Make Ente CLI usable out of the box --- CloudronManifest.json | 2 +- Dockerfile | 7 +++++++ start.sh | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CloudronManifest.json b/CloudronManifest.json index 90ffa62..8acbc02 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -7,7 +7,7 @@ "contactEmail": "contact@ente.io", "tagline": "Open Source End-to-End Encrypted Photos & Authentication", "upstreamVersion": "1.0.0", - "version": "0.1.123", + "version": "0.1.127", "healthCheckPath": "/ping", "httpPort": 3080, "memoryLimit": 1073741824, diff --git a/Dockerfile b/Dockerfile index 1930082..975c432 100644 --- a/Dockerfile +++ b/Dockerfile @@ -143,6 +143,7 @@ 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 @@ -156,6 +157,12 @@ RUN env GOFLAGS= GOMODCACHE=/tmp/cli-go-cache GO111MODULE=on go build -o /app/co 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 diff --git a/start.sh b/start.sh index b33a321..3ac785f 100644 --- a/start.sh +++ b/start.sh @@ -27,6 +27,11 @@ HOME_DIR="/app/data/home" export HOME="$HOME_DIR" mkdir -p "$HOME" +# Ensure CLI data directory persists across restarts +CLI_DATA_PERSIST="/app/data/cli-data" +mkdir -p "$CLI_DATA_PERSIST" + + # Prevent infinite loops through startup flag if [ -f "/app/data/startup_in_progress" ]; then if [ "$(find /app/data/startup_in_progress -mmin +2)" ]; then