From a390643458b498218905a26211d8fb3157e6627d Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 23 Jun 2026 09:46:56 +0800 Subject: [PATCH 1/4] feat(docker): add root entrypoint with privilege dropping for data volumes This updates the Dockerfile and adds a scripts/docker-entrypoint.sh script. Under native Linux (like Debian), when docker-compose mounts a host folder as a volume (e.g. `./data:/app/data`), and the folder doesn't exist, the docker daemon creates the folder as root-owned (`root:root`). Because the container runs as a non-root user `bun`, it gets permission denied (`EACCES`) when trying to write to the data directory. To resolve this in a beginner-friendly way without manual host-side permissions updates: 1. The runner stage now installs `gosu`. 2. At the end of the Dockerfile, the user switches back to `root` so the container launches as root. 3. On launch, the entrypoint script executes. Since it runs as root, it automatically changes ownership of `/app/data` to `bun:bun`. 4. The entrypoint script then uses `gosu` to drop privileges and launch the actual server processes as the non-root `bun` user. --- Dockerfile | 8 ++++++++ scripts/docker-entrypoint.sh | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 scripts/docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 1130e2fc..4d93fdd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ socat \ ca-certificates \ bubblewrap \ + gosu \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -69,5 +70,12 @@ COPY --chown=bun:bun --from=builder /app/prisma.config.ts.prod ./prisma.config.t # Expose port (Bun Hono defaults to 3000) EXPOSE 3000 +# Switch back to root at the end so the container runs the entrypoint as root +USER root +COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh +RUN chmod +x /usr/local/bin/docker-entrypoint.sh + +ENTRYPOINT ["docker-entrypoint.sh"] + # Default command: run migrations and start API server CMD ["sh", "-c", "bun prisma migrate deploy && bun index.js"] diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh new file mode 100644 index 00000000..10ae2ac6 --- /dev/null +++ b/scripts/docker-entrypoint.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +# Check if /app/data exists and is not owned by the bun user (UID 1000) +if [ -d "/app/data" ]; then + if [ "$(stat -c '%u' /app/data)" != "1000" ]; then + echo "Correcting permissions on /app/data..." + chown -R bun:bun /app/data + fi +fi + +# Run the CMD as the bun user +exec gosu bun "$@" From fb5c7ecabe3e4f52889b4a332a71a68edebf13e7 Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 23 Jun 2026 09:52:22 +0800 Subject: [PATCH 2/4] chore(docker): ignore dist and data directories in .dockerignore This adds the `dist` and `data` folders to `.dockerignore` to prevent them from being transferred as part of the Docker build context. This reduces the build context size by over 1.5GB+, making the build much faster. --- .dockerignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.dockerignore b/.dockerignore index 9b495245..1735a828 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,6 @@ node_modules +dist +data Dockerfile* docker-compose* .dockerignore From 661e836f062acf89704066990fe1e28a94c20962 Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 23 Jun 2026 09:56:31 +0800 Subject: [PATCH 3/4] fix(docker): support non-root/restricted container environments in entrypoint Checks if the container is running as root (UID 0) before executing chown and gosu. If running directly as a non-root user (e.g. in hardened environments like Kubernetes runAsNonRoot or via docker run --user), it directly execs the command, preventing EACCES and permission errors. --- scripts/docker-entrypoint.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 10ae2ac6..0d61b1b9 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -1,13 +1,17 @@ #!/bin/sh set -e -# Check if /app/data exists and is not owned by the bun user (UID 1000) -if [ -d "/app/data" ]; then - if [ "$(stat -c '%u' /app/data)" != "1000" ]; then - echo "Correcting permissions on /app/data..." - chown -R bun:bun /app/data +if [ "$(id -u)" = "0" ]; then + # Check if /app/data exists and is not owned by the bun user (UID 1000) + if [ -d "/app/data" ]; then + if [ "$(stat -c '%u' /app/data)" != "1000" ]; then + echo "Correcting permissions on /app/data..." + chown -R bun:bun /app/data + fi fi + # Run the CMD as the bun user + exec gosu bun "$@" +else + # Run the CMD directly if already running as non-root + exec "$@" fi - -# Run the CMD as the bun user -exec gosu bun "$@" From 92801ba14a787d3ef3c5e85ff125f02261363c89 Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 23 Jun 2026 10:02:01 +0800 Subject: [PATCH 4/4] fix(core): make version stack sort index lookup deterministic When creating a version stack, the sortIndex was previously extracted by taking files[0] from the database query result. Because findMany without orderBy is non-deterministic, this resulted in flakiness where the sortIndex would sometimes be null (from file2) instead of 'abc' (from file1), causing tests to fail. We now look up the first file specifically based on the ordered fileIds array parameter. --- packages/core/src/versionStack/versionStack.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/versionStack/versionStack.ts b/packages/core/src/versionStack/versionStack.ts index ab5fb746..259c7a84 100644 --- a/packages/core/src/versionStack/versionStack.ts +++ b/packages/core/src/versionStack/versionStack.ts @@ -58,7 +58,7 @@ export class VersionStackService { throw new Error('parent not found') } - const firstFile = files[0] + const firstFile = files.find((f) => f.id === fileIds[0]) const sortIndex = firstFile?.sortIndex || null const stack = await tx.asset.create({