diff --git a/apps/server/Dockerfile.alpine.rootless b/apps/server/Dockerfile.alpine.rootless index 5e6cba525..e8bd0461f 100644 --- a/apps/server/Dockerfile.alpine.rootless +++ b/apps/server/Dockerfile.alpine.rootless @@ -26,7 +26,6 @@ WORKDIR /home/${USER}/app COPY ./dist /home/${USER}/app # Also copy the rootless entrypoint script COPY rootless-entrypoint.sh /home/${USER}/app/ -RUN chmod +x /home/${USER}/app/rootless-entrypoint.sh RUN rm -rf /home/${USER}/app/node_modules/better-sqlite3 COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /home/${USER}/app/node_modules/better-sqlite3 RUN chown -R ${USER}:${USER} /home/${USER} @@ -45,6 +44,6 @@ ENV TRILIUM_DATA_DIR=/home/${USER}/trilium-data ENTRYPOINT ["/usr/bin/dumb-init", "--"] # Use the entrypoint script -CMD /home/${USER}/app/rootless-entrypoint.sh +CMD [ "bash", "./rootless-entrypoint.sh" ] HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js diff --git a/apps/server/Dockerfile.rootless b/apps/server/Dockerfile.rootless index df94ddb90..ca77f85ba 100644 --- a/apps/server/Dockerfile.rootless +++ b/apps/server/Dockerfile.rootless @@ -28,7 +28,6 @@ WORKDIR /home/${USER}/app COPY ./dist /home/${USER}/app # Also copy the rootless entrypoint script COPY rootless-entrypoint.sh /home/${USER}/app/ -RUN chmod +x /home/${USER}/app/rootless-entrypoint.sh RUN rm -rf /home/${USER}/app/node_modules/better-sqlite3 COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /home/${USER}/app/node_modules/better-sqlite3 RUN chown -R ${USER}:${USER} /home/${USER} @@ -44,6 +43,6 @@ ENV TRILIUM_GID=${GID} ENV TRILIUM_DATA_DIR=/home/${USER}/trilium-data # Use the entrypoint script -CMD /home/${USER}/app/rootless-entrypoint.sh +CMD [ "bash", "./rootless-entrypoint.sh" ] HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js diff --git a/apps/server/rootless-entrypoint.sh b/apps/server/rootless-entrypoint.sh index 0d580285f..4056df2a2 100755 --- a/apps/server/rootless-entrypoint.sh +++ b/apps/server/rootless-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Rootless entrypoint script for Trilium Notes # Works with both Debian and Alpine-based images