Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 20:36:13 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into refactor/typecheck_errors

Browse Source
This commit is contained in:
Elian Doran
2025-05-29 09:35:12 +03:00
parent f87e7fb577 78236954e5
commit 7651083e63
14 changed files with 376 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/Dockerfile.alpine.rootless
View File

@@ -1,4 +1,4 @@
FROM node:22.15.0-alpine AS builder
FROM node:22.16.0-alpine AS builder
RUN corepack enable
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:22.15.0-alpine
FROM node:22.16.0-alpine
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

4
apps/server/Dockerfile.rootless
View File

@@ -1,4 +1,4 @@
FROM node:22.15.0-bullseye-slim AS builder
FROM node:22.16.0-bullseye-slim AS builder
RUN corepack enable
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:22.15.0-bullseye-slim
FROM node:22.16.0-bullseye-slim
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

4
apps/server/package.json
View File

@@ -59,7 +59,7 @@
"debounce": "2.2.0",
"debug": "4.4.1",
"ejs": "3.1.10",
"electron": "36.3.1",
"electron": "36.3.2",
"electron-debug": "4.1.0",
"electron-window-state": "5.0.3",
"escape-html": "1.0.3",
@@ -74,7 +74,7 @@
"html2plaintext": "2.1.4",
"http-proxy-agent": "7.0.2",
"https-proxy-agent": "7.0.6",
"i18next": "25.2.0",
"i18next": "25.2.1",
"i18next-fs-backend": "2.6.0",
"image-type": "6.0.0",
"ini": "5.0.0",