Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _regroup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@playwright/test": "1.51.1",
"@stylistic/eslint-plugin": "4.2.0",
"@types/express": "5.0.1",
"@types/node": "22.14.1",
"@types/node": "22.15.3",
"@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.1.1",
"eslint": "9.24.0",
Expand Down
2 changes: 1 addition & 1 deletion _regroup_monorepo/apps/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN npm ci && \
# as we install necessary dependencies in runtime buildstage anyways

# Runtime stage
FROM node:22.14.0-bullseye-slim
FROM node:22.15.0-bullseye-slim

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion _regroup_monorepo/apps/server/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM node:22.14.0-alpine AS builder
FROM node:22.15.0-alpine AS builder

WORKDIR /usr/src/app/build

Expand Down
4 changes: 2 additions & 2 deletions apps/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:22.14.0-bullseye-slim AS builder
FROM node:22.15.0-bullseye-slim AS builder
RUN corepack enable

# Install native dependencies since we might be building cross-platform.
WORKDIR /usr/src/app/build
COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/
RUN pnpm install --frozen-lockfile --prod && pnpm rebuild

FROM node:22.14.0-bullseye-slim
FROM node:22.15.0-bullseye-slim
# Install only runtime dependencies
RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions apps/server/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:22.14.0-alpine AS builder
FROM node:22.15.0-alpine AS builder
RUN corepack enable

# Install native dependencies since we might be building cross-platform.
WORKDIR /usr/src/app
COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/
RUN pnpm install --frozen-lockfile --prod && pnpm rebuild

FROM node:22.14.0-alpine
FROM node:22.15.0-alpine
# Install runtime dependencies
RUN apk add --no-cache su-exec shadow

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@swc/helpers": "~0.5.11",
"@triliumnext/server": "workspace:*",
"@types/express": "^4.17.21",
"@types/node": "18.16.9",
"@types/node": "22.15.3",
"@vitest/coverage-v8": "^3.0.5",
"@vitest/ui": "^3.0.0",
"cross-env": "7.0.3",
Expand Down
139 changes: 73 additions & 66 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Loading