Skip to content

Open-source status page, incident response and uptime monitoring

fix(server): install deps with pnpm (#2186)

Colin Ozanne60d95e453784
diff --git a/apps/server/.dockerignore b/apps/server/.dockerignore
index a6903313b..36b713083 100644
--- a/apps/server/.dockerignore
+++ b/apps/server/.dockerignore
@@ -1,4 +1,4 @@
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.8.0
# See https://github.com/lenra-io/dofigen
node_modules
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index 16a3cc0f2..31bbfdf5b 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -1,16 +1,18 @@
# syntax=docker/dockerfile:1.19.0
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.8.0
# See https://github.com/lenra-io/dofigen
# install
-FROM oven/bun@sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a AS install
+FROM node@sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf AS install
LABEL \
- org.opencontainers.image.base.digest="sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a" \
- org.opencontainers.image.base.name="docker.io/oven/bun:1.3.6" \
+ org.opencontainers.image.base.digest="sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf" \
+ org.opencontainers.image.base.name="docker.io/node:24-slim" \
org.opencontainers.image.stage="install"
WORKDIR /app/
RUN \
- --mount=type=bind,target=bunfig.toml,source=bunfig.toml \
+ --mount=type=bind,target=pnpm-workspace.yaml,source=pnpm-workspace.yaml \
+ --mount=type=bind,target=pnpm-lock.yaml,source=pnpm-lock.yaml \
+ --mount=type=bind,target=patches,source=patches \
--mount=type=bind,target=package.json,source=package.json \
--mount=type=bind,target=apps/server/package.json,source=apps/server/package.json \
--mount=type=bind,target=packages/analytics/package.json,source=packages/analytics/package.json \
@@ -44,8 +46,11 @@ RUN \
--mount=type=bind,target=packages/locales/package.json,source=packages/locales/package.json \
--mount=type=bind,target=packages/services/package.json,source=packages/services/package.json \
--mount=type=bind,target=packages/importers/package.json,source=packages/importers/package.json \
- --mount=type=cache,target=/root/.bun/install/cache,sharing=locked \
- bun install --production --frozen-lockfile --verbose
+ --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
+ <<EOF
+corepack enable pnpm
+pnpm install --prod --frozen-lockfile --verbose
+EOF
# build
FROM oven/bun@sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a AS build
@@ -62,14 +67,22 @@ COPY \
--from=install \
--link \
"/app/node_modules" "/app/node_modules"
+COPY \
+ --from=install \
+ --link \
+ "/app/apps/server/node_modules" "/app/apps/server/node_modules"
+COPY \
+ --from=install \
+ --link \
+ "/app/packages" "/app/packages"
RUN bun build --compile --sourcemap src/index.ts --outfile=app
# runtime
-FROM debian@sha256:1a4701c321b1d28b1ff5f0230e766791e4b79b1d4c6c7a70064f4b297b1a330f AS runtime
+FROM debian@sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604 AS runtime
LABEL \
- io.dofigen.version="2.6.0" \
+ io.dofigen.version="2.8.0" \
org.opencontainers.image.authors="OpenStatus Team" \
- org.opencontainers.image.base.digest="sha256:1a4701c321b1d28b1ff5f0230e766791e4b79b1d4c6c7a70064f4b297b1a330f" \
+ org.opencontainers.image.base.digest="sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604" \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
org.opencontainers.image.description="REST API server with Hono framework for OpenStatus" \
org.opencontainers.image.source="https://github.com/openstatusHQ/openstatus" \
diff --git a/apps/server/dofigen.lock b/apps/server/dofigen.lock
index cddcd18d2..74142b340 100644
--- a/apps/server/dofigen.lock
+++ b/apps/server/dofigen.lock
@@ -12,20 +12,25 @@ effective: |
builders:
install:
fromImage:
- path: oven/bun
- digest: sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a
+ path: node
+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
label:
- org.opencontainers.image.base.digest: sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a
+ org.opencontainers.image.base.name: docker.io/node:24-slim
+ org.opencontainers.image.base.digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
org.opencontainers.image.stage: install
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.6
workdir: /app/
run:
- - bun install --production --frozen-lockfile --verbose
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - target: /root/.bun/install/cache
+ - target: /root/.local/share/pnpm/store
bind:
- - target: bunfig.toml
- source: bunfig.toml
+ - target: pnpm-workspace.yaml
+ source: pnpm-workspace.yaml
+ - target: pnpm-lock.yaml
+ source: pnpm-lock.yaml
+ - target: patches
+ source: patches
- target: package.json
source: package.json
- target: apps/server/package.json
@@ -97,9 +102,9 @@ effective: |
path: oven/bun
digest: sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a
label:
- org.opencontainers.image.stage: build
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.6
org.opencontainers.image.base.digest: sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.6
+ org.opencontainers.image.stage: build
workdir: /app/apps/server
env:
NODE_ENV: production
@@ -111,20 +116,28 @@ effective: |
paths:
- /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ paths:
+ - /app/apps/server/node_modules
+ target: /app/apps/server/node_modules
+ - fromBuilder: install
+ paths:
+ - /app/packages
+ target: /app/packages
run:
- bun build --compile --sourcemap src/index.ts --outfile=app
fromImage:
path: debian
- digest: sha256:1a4701c321b1d28b1ff5f0230e766791e4b79b1d4c6c7a70064f4b297b1a330f
+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
label:
- org.opencontainers.image.title: OpenStatus Server
+ org.opencontainers.image.authors: OpenStatus Team
org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
+ io.dofigen.version: 2.8.0
+ org.opencontainers.image.description: REST API server with Hono framework for OpenStatus
org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.authors: OpenStatus Team
- io.dofigen.version: 2.6.0
- org.opencontainers.image.base.digest: sha256:1a4701c321b1d28b1ff5f0230e766791e4b79b1d4c6c7a70064f4b297b1a330f
+ org.opencontainers.image.base.digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
+ org.opencontainers.image.title: OpenStatus Server
org.opencontainers.image.vendor: OpenStatus
- org.opencontainers.image.description: REST API server with Hono framework for OpenStatus
user:
user: '1000'
group: '1000'
@@ -151,17 +164,20 @@ effective: |
retries: 3
images:
docker.io:
- library:
- debian:
- bullseye-slim:
- digest: sha256:1a4701c321b1d28b1ff5f0230e766791e4b79b1d4c6c7a70064f4b297b1a330f
oven:
bun:
1.3.6:
digest: sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a
+ library:
+ debian:
+ bullseye-slim:
+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
+ node:
+ 24-slim:
+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
resources:
dofigen.yml:
- hash: c9490c75001074e3e201504aa5b4251e3e96ba6648b5512dfbaf497e56a57cbc
+ hash: ced0248a6d50292b50f230ddb23b143b32a255a3ecc744ede63995b7921d643e
content: |
# Files to exclude from Docker context
ignore:
@@ -178,12 +194,14 @@ resources:
builders:
# Stage 1: Install production dependencies
install:
- fromImage: oven/bun:1.3.6
+ fromImage: node:24-slim
workdir: /app/
labels:
org.opencontainers.image.stage: install
bind:
- - bunfig.toml
+ - pnpm-workspace.yaml
+ - pnpm-lock.yaml
+ - patches
- package.json
- apps/server/package.json
- packages/analytics/package.json
@@ -217,9 +235,11 @@ resources:
- packages/locales/package.json
- packages/services/package.json
- packages/importers/package.json
- run: bun install --production --frozen-lockfile --verbose
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - /root/.bun/install/cache
+ - /root/.local/share/pnpm/store
# Stage 2: Build application (compile to binary)
build:
@@ -234,6 +254,12 @@ resources:
- fromBuilder: install
source: /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ source: /app/apps/server/node_modules
+ target: /app/apps/server/node_modules
+ - fromBuilder: install
+ source: /app/packages
+ target: /app/packages
run: bun build --compile --sourcemap src/index.ts --outfile=app
# Runtime stage
diff --git a/apps/server/dofigen.yml b/apps/server/dofigen.yml
index f59580492..19c2ab702 100644
--- a/apps/server/dofigen.yml
+++ b/apps/server/dofigen.yml
@@ -13,12 +13,14 @@ ignore:
builders:
# Stage 1: Install production dependencies
install:
- fromImage: oven/bun:1.3.6
+ fromImage: node:24-slim
workdir: /app/
labels:
org.opencontainers.image.stage: install
bind:
- - bunfig.toml
+ - pnpm-workspace.yaml
+ - pnpm-lock.yaml
+ - patches
- package.json
- apps/server/package.json
- packages/analytics/package.json
@@ -52,9 +54,11 @@ builders:
- packages/locales/package.json
- packages/services/package.json
- packages/importers/package.json
- run: bun install --production --frozen-lockfile --verbose
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - /root/.bun/install/cache
+ - /root/.local/share/pnpm/store
# Stage 2: Build application (compile to binary)
build:
@@ -69,6 +73,12 @@ builders:
- fromBuilder: install
source: /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ source: /app/apps/server/node_modules
+ target: /app/apps/server/node_modules
+ - fromBuilder: install
+ source: /app/packages
+ target: /app/packages
run: bun build --compile --sourcemap src/index.ts --outfile=app
# Runtime stage
diff --git a/apps/workflows/.dockerignore b/apps/workflows/.dockerignore
index 5e73b32b9..6ae672226 100644
--- a/apps/workflows/.dockerignore
+++ b/apps/workflows/.dockerignore
@@ -1,4 +1,4 @@
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.8.0
# See https://github.com/lenra-io/dofigen
node_modules
diff --git a/apps/workflows/Dockerfile b/apps/workflows/Dockerfile
index 91634aaf4..7349a9579 100644
--- a/apps/workflows/Dockerfile
+++ b/apps/workflows/Dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.19.0
-# This file is generated by Dofigen v2.6.0
+# This file is generated by Dofigen v2.8.0
# See https://github.com/lenra-io/dofigen
# docker
@@ -14,14 +14,16 @@ COPY \
RUN bun run src/build-docker.ts
# install
-FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS install
+FROM node@sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf AS install
LABEL \
- org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \
- org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11" \
+ org.opencontainers.image.base.digest="sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf" \
+ org.opencontainers.image.base.name="docker.io/node:24-slim" \
org.opencontainers.image.stage="install"
WORKDIR /app/
RUN \
- --mount=type=bind,target=bunfig.toml,source=bunfig.toml \
+ --mount=type=bind,target=pnpm-workspace.yaml,source=pnpm-workspace.yaml \
+ --mount=type=bind,target=pnpm-lock.yaml,source=pnpm-lock.yaml \
+ --mount=type=bind,target=patches,source=patches \
--mount=type=bind,target=package.json,source=package.json \
--mount=type=bind,target=apps/workflows/package.json,source=apps/workflows/package.json \
--mount=type=bind,target=packages/assertions/package.json,source=packages/assertions/package.json \
@@ -52,8 +54,11 @@ RUN \
--mount=type=bind,target=packages/theme-store/package.json,source=packages/theme-store/package.json \
--mount=type=bind,target=packages/locales/package.json,source=packages/locales/package.json \
--mount=type=bind,target=packages/status-fetcher/package.json,source=packages/status-fetcher/package.json \
- --mount=type=cache,target=/root/.bun/install/cache,sharing=locked \
- bun install --production --frozen-lockfile --verbose
+ --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
+ <<EOF
+corepack enable pnpm
+pnpm install --prod --frozen-lockfile --verbose
+EOF
# build
FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS build
@@ -70,26 +75,38 @@ COPY \
--from=install \
--link \
"/app/node_modules" "/app/node_modules"
+COPY \
+ --from=install \
+ --link \
+ "/app/apps/workflows/node_modules" "/app/apps/workflows/node_modules"
+COPY \
+ --from=install \
+ --link \
+ "/app/packages" "/app/packages"
RUN bun build --compile --target bun --sourcemap src/index.ts --outfile=app
# libsql
-FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS libsql
+FROM node@sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf AS libsql
LABEL \
- org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \
- org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11"
+ org.opencontainers.image.base.digest="sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf" \
+ org.opencontainers.image.base.name="docker.io/node:24-slim"
WORKDIR /app/
COPY \
--from=docker \
--link \
"/app/apps/build-docker/package.json" "/app/package.json"
-RUN bun install
+RUN <<EOF
+corepack enable pnpm
+pnpm install --prod --lockfile-only
+pnpm install --prod --frozen-lockfile
+EOF
# runtime
-FROM debian@sha256:b32674fb57780ad57d7b0749242d3f585f462f4ec4a60ae0adacd945f9cb9734 AS runtime
+FROM debian@sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604 AS runtime
LABEL \
- io.dofigen.version="2.6.0" \
+ io.dofigen.version="2.8.0" \
org.opencontainers.image.authors="OpenStatus Team" \
- org.opencontainers.image.base.digest="sha256:b32674fb57780ad57d7b0749242d3f585f462f4ec4a60ae0adacd945f9cb9734" \
+ org.opencontainers.image.base.digest="sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604" \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
org.opencontainers.image.description="Background job processing and probe scheduling for OpenStatus" \
org.opencontainers.image.source="https://github.com/openstatusHQ/openstatus" \
diff --git a/apps/workflows/dofigen.lock b/apps/workflows/dofigen.lock
index e21ed65c3..a99a02adc 100644
--- a/apps/workflows/dofigen.lock
+++ b/apps/workflows/dofigen.lock
@@ -17,9 +17,9 @@ effective: |
path: oven/bun
digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
label:
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
org.opencontainers.image.stage: build
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
workdir: /app/apps/workflows
env:
NODE_ENV: production
@@ -31,24 +31,51 @@ effective: |
paths:
- /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ paths:
+ - /app/apps/workflows/node_modules
+ target: /app/apps/workflows/node_modules
+ - fromBuilder: install
+ paths:
+ - /app/packages
+ target: /app/packages
run:
- bun build --compile --target bun --sourcemap src/index.ts --outfile=app
- install:
+ docker:
fromImage:
path: oven/bun
digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
label:
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
+ workdir: /app/apps/workflows
+ copy:
+ - paths:
+ - .
+ target: /app/
+ run:
+ - bun run src/build-docker.ts
+ install:
+ fromImage:
+ path: node
+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
+ label:
+ org.opencontainers.image.base.name: docker.io/node:24-slim
+ org.opencontainers.image.base.digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
org.opencontainers.image.stage: install
workdir: /app/
run:
- - bun install --production --frozen-lockfile --verbose
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - target: /root/.bun/install/cache
+ - target: /root/.local/share/pnpm/store
bind:
- - target: bunfig.toml
- source: bunfig.toml
+ - target: pnpm-workspace.yaml
+ source: pnpm-workspace.yaml
+ - target: pnpm-lock.yaml
+ source: pnpm-lock.yaml
+ - target: patches
+ source: patches
- target: package.json
source: package.json
- target: apps/workflows/package.json
@@ -109,27 +136,13 @@ effective: |
source: packages/locales/package.json
- target: packages/status-fetcher/package.json
source: packages/status-fetcher/package.json
- docker:
- fromImage:
- path: oven/bun
- digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
- label:
- org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
- workdir: /app/apps/workflows
- copy:
- - paths:
- - .
- target: /app/
- run:
- - bun run src/build-docker.ts
libsql:
fromImage:
- path: oven/bun
- digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
+ path: node
+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
label:
- org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11
+ org.opencontainers.image.base.digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
+ org.opencontainers.image.base.name: docker.io/node:24-slim
workdir: /app/
copy:
- fromBuilder: docker
@@ -137,19 +150,21 @@ effective: |
- /app/apps/build-docker/package.json
target: /app/package.json
run:
- - bun install
+ - corepack enable pnpm
+ - pnpm install --prod --lockfile-only
+ - pnpm install --prod --frozen-lockfile
fromImage:
path: debian
- digest: sha256:b32674fb57780ad57d7b0749242d3f585f462f4ec4a60ae0adacd945f9cb9734
+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
label:
- io.dofigen.version: 2.6.0
- org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
org.opencontainers.image.title: OpenStatus Workflows
- org.opencontainers.image.base.digest: sha256:b32674fb57780ad57d7b0749242d3f585f462f4ec4a60ae0adacd945f9cb9734
- org.opencontainers.image.authors: OpenStatus Team
+ org.opencontainers.image.vendor: OpenStatus
+ io.dofigen.version: 2.8.0
org.opencontainers.image.description: Background job processing and probe scheduling for OpenStatus
+ org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.vendor: OpenStatus
+ org.opencontainers.image.base.digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
+ org.opencontainers.image.authors: OpenStatus Team
workdir: /app/
copy:
- fromBuilder: build
@@ -179,12 +194,15 @@ images:
1.3.11:
digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7
library:
+ node:
+ 24-slim:
+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf
debian:
bullseye-slim:
- digest: sha256:b32674fb57780ad57d7b0749242d3f585f462f4ec4a60ae0adacd945f9cb9734
+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604
resources:
dofigen.yml:
- hash: a70bae0367478edf21aecadde7e0add58984a9c388b17e54533f0927b46071f7
+ hash: b0556b6e2f3d45cd5103337d8a9679dea843f71ee60f35ee7e350275d6749933
content: |
ignore:
- node_modules
@@ -200,12 +218,14 @@ resources:
- /packages/tracker
builders:
install:
- fromImage: oven/bun:1.3.11
+ fromImage: node:24-slim
workdir: /app/
labels:
org.opencontainers.image.stage: install
bind:
- - bunfig.toml
+ - pnpm-workspace.yaml
+ - pnpm-lock.yaml
+ - patches
- package.json
- apps/workflows/package.json
- packages/assertions/package.json
@@ -238,9 +258,11 @@ resources:
- packages/status-fetcher/package.json
# Install dependencies
- run: bun install --production --frozen-lockfile --verbose
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - /root/.bun/install/cache
+ - /root/.local/share/pnpm/store
# Stage 4: Build application (compile to binary)
build:
@@ -253,6 +275,12 @@ resources:
- fromBuilder: install
source: /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ source: /app/apps/workflows/node_modules
+ target: /app/apps/workflows/node_modules
+ - fromBuilder: install
+ source: /app/packages
+ target: /app/packages
# Should set env to production here
# Compile the TypeScript application
env:
@@ -267,13 +295,16 @@ resources:
run: bun run src/build-docker.ts
libsql:
- fromImage: oven/bun:1.3.11
+ fromImage: node:24-slim
workdir: /app/
copy:
- fromBuilder: docker
source: /app/apps/build-docker/package.json
target: /app/package.json
- run: bun install
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --lockfile-only
+ - pnpm install --prod --frozen-lockfile
fromImage: debian:bullseye-slim
workdir: /app/
diff --git a/apps/workflows/dofigen.yml b/apps/workflows/dofigen.yml
index d3a388ba4..781e63336 100644
--- a/apps/workflows/dofigen.yml
+++ b/apps/workflows/dofigen.yml
@@ -12,12 +12,14 @@ ignore:
- /packages/tracker
builders:
install:
- fromImage: oven/bun:1.3.11
+ fromImage: node:24-slim
workdir: /app/
labels:
org.opencontainers.image.stage: install
bind:
- - bunfig.toml
+ - pnpm-workspace.yaml
+ - pnpm-lock.yaml
+ - patches
- package.json
- apps/workflows/package.json
- packages/assertions/package.json
@@ -50,9 +52,11 @@ builders:
- packages/status-fetcher/package.json
# Install dependencies
- run: bun install --production --frozen-lockfile --verbose
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --frozen-lockfile --verbose
cache:
- - /root/.bun/install/cache
+ - /root/.local/share/pnpm/store
# Stage 4: Build application (compile to binary)
build:
@@ -65,6 +69,12 @@ builders:
- fromBuilder: install
source: /app/node_modules
target: /app/node_modules
+ - fromBuilder: install
+ source: /app/apps/workflows/node_modules
+ target: /app/apps/workflows/node_modules
+ - fromBuilder: install
+ source: /app/packages
+ target: /app/packages
# Should set env to production here
# Compile the TypeScript application
env:
@@ -79,13 +89,16 @@ builders:
run: bun run src/build-docker.ts
libsql:
- fromImage: oven/bun:1.3.11
+ fromImage: node:24-slim
workdir: /app/
copy:
- fromBuilder: docker
source: /app/apps/build-docker/package.json
target: /app/package.json
- run: bun install
+ run:
+ - corepack enable pnpm
+ - pnpm install --prod --lockfile-only
+ - pnpm install --prod --frozen-lockfile
fromImage: debian:bullseye-slim
workdir: /app/
diff --git a/apps/workflows/src/build-docker.ts b/apps/workflows/src/build-docker.ts
index 5d8fe116e..1db9537cb 100644
--- a/apps/workflows/src/build-docker.ts
+++ b/apps/workflows/src/build-docker.ts
@@ -8,10 +8,58 @@ const packageJson: PackageJson = await Bun.file(
).json();
const extractDependenciesNames = ["@libsql/client"];
+const workspaceConfig = await Bun.file(
+ path.join(__dirname, "../../../pnpm-workspace.yaml"),
+).text();
+
+const catalog = (() => {
+ const lines = workspaceConfig.split(/\r?\n/);
+ let inCatalog = false;
+ const entries: Record<string, string> = {};
+
+ for (const line of lines) {
+ if (!inCatalog) {
+ if (line.trim() === "catalog:") {
+ inCatalog = true;
+ }
+ continue;
+ }
+
+ if (!line.startsWith(" ")) {
+ break;
+ }
+
+ const match = line.match(/^\s{2}("[^"]+"|[^:]+):\s*(.+)$/);
+ if (!match) {
+ continue;
+ }
+
+ const key = match[1].replace(/^"|"$/g, "").trim();
+ const value = match[2].replace(/^"|"$/g, "").trim();
+ entries[key] = value;
+ }
+
+ return entries;
+})();
+
+const resolveVersion = (name: string, spec: string) => {
+ if (!spec.startsWith("catalog:")) {
+ return spec;
+ }
+
+ const resolved = catalog[name];
+ if (!resolved) {
+ throw new Error(`Missing catalog entry for ${name}`);
+ }
+
+ return resolved;
+};
+
const extractedDependencies = extractDependenciesNames.reduce(
(acc, cur) => {
- if (packageJson.dependencies[cur]) {
- acc[cur] = packageJson.dependencies[cur];
+ const spec = packageJson.dependencies[cur];
+ if (spec) {
+ acc[cur] = resolveVersion(cur, spec);
}
return acc;
diff --git a/packages/assertions/package.json b/packages/assertions/package.json
index 24fd49763..49758b484 100644
--- a/packages/assertions/package.json
+++ b/packages/assertions/package.json
@@ -5,12 +5,12 @@
"main": "src/index.ts",
"scripts": {},
"dependencies": {
- "jsonpath-plus": "catalog:"
+ "jsonpath-plus": "catalog:",
+ "zod": "catalog:"
},
"devDependencies": {
"@openstatus/tsconfig": "workspace:*",
- "typescript": "catalog:",
- "zod": "catalog:"
+ "typescript": "catalog:"
},
"keywords": [],
"author": "",
diff --git a/packages/emails/package.json b/packages/emails/package.json
index 10ccf0b5e..4057addff 100644
--- a/packages/emails/package.json
+++ b/packages/emails/package.json
@@ -13,6 +13,7 @@
"dependencies": {
"@t3-oss/env-core": "catalog:",
"effect": "catalog:",
+ "react": "catalog:",
"react-email": "catalog:",
"resend": "catalog:",
"zod": "catalog:"
@@ -22,7 +23,6 @@
"@react-email/ui": "catalog:",
"@types/node": "catalog:",
"@types/react": "catalog:",
- "react": "catalog:",
"typescript": "catalog:"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index df3223afa..d080ac8db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1976,6 +1976,9 @@ importers:
jsonpath-plus:
specifier: 'catalog:'
version: 7.2.0
+ zod:
+ specifier: 'catalog:'
+ version: 4.1.13
devDependencies:
'@openstatus/tsconfig':
specifier: workspace:*
@@ -1983,9 +1986,6 @@ importers:
typescript:
specifier: 'catalog:'
version: 5.9.3
- zod:
- specifier: 'catalog:'
- version: 4.1.13
packages/db:
dependencies:
@@ -2050,6 +2050,9 @@ importers:
effect:
specifier: 'catalog:'
version: 3.21.2
+ react:
+ specifier: 'catalog:'
+ version: 19.2.6
react-email:
specifier: 'catalog:'
@@ -2072,9 +2075,6 @@ importers:
'@types/react':
specifier: 'catalog:'
version: 19.2.15
- react:
- specifier: 'catalog:'
- version: 19.2.6
typescript:
specifier: 'catalog:'
version: 5.9.3