From 003b30fd097662c4c4f3b739760c77d2e9a54c96 Mon Sep 17 00:00:00 2001 From: Maximilian Kaske Date: Thu, 23 Jul 2026 10:43:24 +0200 Subject: [PATCH] fix: docker --- apps/server/Dockerfile | 5 +- apps/server/dofigen.lock | 25 +++++----- apps/server/dofigen.yml | 1 - apps/workflows/.dockerignore | 1 - apps/workflows/Dockerfile | 4 +- apps/workflows/dofigen.lock | 92 ++++++++++++++++++------------------ apps/workflows/dofigen.yml | 1 - 7 files changed, 60 insertions(+), 69 deletions(-) diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index 53c0a483..1e8f1c6f 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -3,9 +3,9 @@ # See https://github.com/lenra-io/dofigen # install -FROM node@sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc AS install +FROM node@sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d AS install LABEL \ - org.opencontainers.image.base.digest="sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc" \ + org.opencontainers.image.base.digest="sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d" \ org.opencontainers.image.base.name="docker.io/node:24-slim" \ org.opencontainers.image.stage="install" WORKDIR /app/ @@ -35,7 +35,6 @@ RUN \ --mount=type=bind,target=packages/error/package.json,source=packages/error/package.json \ --mount=type=bind,target=packages/regions/package.json,source=packages/regions/package.json \ --mount=type=bind,target=packages/tinybird/package.json,source=packages/tinybird/package.json \ - --mount=type=bind,target=packages/tracker/package.json,source=packages/tracker/package.json \ --mount=type=bind,target=packages/upstash/package.json,source=packages/upstash/package.json \ --mount=type=bind,target=packages/utils/package.json,source=packages/utils/package.json \ --mount=type=bind,target=packages/tsconfig/package.json,source=packages/tsconfig/package.json \ diff --git a/apps/server/dofigen.lock b/apps/server/dofigen.lock index 1541f24f..89d2f366 100644 --- a/apps/server/dofigen.lock +++ b/apps/server/dofigen.lock @@ -13,10 +13,10 @@ effective: | install: fromImage: path: node - digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc + digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d label: + org.opencontainers.image.base.digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d org.opencontainers.image.base.name: docker.io/node:24-slim - org.opencontainers.image.base.digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc org.opencontainers.image.stage: install workdir: /app/ run: @@ -75,8 +75,6 @@ effective: | source: packages/regions/package.json - target: packages/tinybird/package.json source: packages/tinybird/package.json - - target: packages/tracker/package.json - source: packages/tracker/package.json - target: packages/upstash/package.json source: packages/upstash/package.json - target: packages/utils/package.json @@ -100,9 +98,9 @@ effective: | path: denoland/deno digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 label: + org.opencontainers.image.base.digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 org.opencontainers.image.base.name: docker.io/denoland/deno:2.9.2 org.opencontainers.image.stage: build - org.opencontainers.image.base.digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 workdir: /app/apps/server env: NODE_ENV: production @@ -131,13 +129,13 @@ effective: | path: hi/curl digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 label: + io.dofigen.version: 2.8.0 org.opencontainers.image.vendor: OpenStatus + org.opencontainers.image.authors: OpenStatus Team org.opencontainers.image.title: OpenStatus Server + org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus org.opencontainers.image.description: REST API server with Hono framework for OpenStatus - org.opencontainers.image.authors: OpenStatus Team org.opencontainers.image.base.digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 - io.dofigen.version: 2.8.0 - org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus user: user: '1000' group: '1000' @@ -159,17 +157,17 @@ effective: | retries: 3 images: docker.io: - library: - node: - 24-slim: - digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc denoland: deno: 2.9.2: digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 + library: + node: + 24-slim: + digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d resources: dofigen.yml: - hash: e62db1a487a23f2bce5f3353470c8923b67cd6b5a1a78bef29bc448bd3571094 + hash: 0e7eb2edfd3c09393dca866cd90f058272276c48f1a0a5e9ffb235f4493755ae content: | # Files to exclude from Docker context ignore: @@ -216,7 +214,6 @@ resources: - packages/error/package.json - packages/regions/package.json - packages/tinybird/package.json - - packages/tracker/package.json - packages/upstash/package.json - packages/utils/package.json - packages/tsconfig/package.json diff --git a/apps/server/dofigen.yml b/apps/server/dofigen.yml index 2735187b..c72b7973 100644 --- a/apps/server/dofigen.yml +++ b/apps/server/dofigen.yml @@ -43,7 +43,6 @@ builders: - packages/error/package.json - packages/regions/package.json - packages/tinybird/package.json - - packages/tracker/package.json - packages/upstash/package.json - packages/utils/package.json - packages/tsconfig/package.json diff --git a/apps/workflows/.dockerignore b/apps/workflows/.dockerignore index 6ae67222..e9a9941a 100644 --- a/apps/workflows/.dockerignore +++ b/apps/workflows/.dockerignore @@ -11,4 +11,3 @@ node_modules /packages/analytics /packages/api /packages/error -/packages/tracker diff --git a/apps/workflows/Dockerfile b/apps/workflows/Dockerfile index 65f3666f..c544e042 100644 --- a/apps/workflows/Dockerfile +++ b/apps/workflows/Dockerfile @@ -3,9 +3,9 @@ # See https://github.com/lenra-io/dofigen # install -FROM node@sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc AS install +FROM node@sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d AS install LABEL \ - org.opencontainers.image.base.digest="sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc" \ + org.opencontainers.image.base.digest="sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d" \ org.opencontainers.image.base.name="docker.io/node:24-slim" \ org.opencontainers.image.stage="install" WORKDIR /app/ diff --git a/apps/workflows/dofigen.lock b/apps/workflows/dofigen.lock index 83e11348..06679dfa 100644 --- a/apps/workflows/dofigen.lock +++ b/apps/workflows/dofigen.lock @@ -10,48 +10,13 @@ effective: | - /packages/analytics - /packages/api - /packages/error - - /packages/tracker builders: - build: - fromImage: - path: denoland/deno - digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 - label: - org.opencontainers.image.stage: build - org.opencontainers.image.base.digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 - org.opencontainers.image.base.name: docker.io/denoland/deno:2.9.2 - workdir: /app/apps/workflows - env: - NODE_ENV: production - copy: - - paths: - - . - target: /app/ - - fromBuilder: install - 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: - - mkdir -p /tmp/sc - - deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))' - - cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts - - cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts - - cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs - - mkdir -p /app/data install: fromImage: path: node - digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc + digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d label: - org.opencontainers.image.base.digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc + org.opencontainers.image.base.digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d org.opencontainers.image.base.name: docker.io/node:24-slim org.opencontainers.image.stage: install workdir: /app/ @@ -125,19 +90,53 @@ effective: | source: packages/locales/package.json - target: packages/status-fetcher/package.json source: packages/status-fetcher/package.json + build: + fromImage: + path: denoland/deno + digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 + label: + org.opencontainers.image.stage: build + org.opencontainers.image.base.name: docker.io/denoland/deno:2.9.2 + org.opencontainers.image.base.digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 + workdir: /app/apps/workflows + env: + NODE_ENV: production + copy: + - paths: + - . + target: /app/ + - fromBuilder: install + 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: + - mkdir -p /tmp/sc + - deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))' + - cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts + - cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts + - cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs + - mkdir -p /app/data fromImage: host: registry.access.redhat.com port: 443 path: hi/curl digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 label: - org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus - org.opencontainers.image.authors: OpenStatus Team + org.opencontainers.image.base.digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 org.opencontainers.image.description: Background job processing and probe scheduling for OpenStatus org.opencontainers.image.title: OpenStatus Workflows - org.opencontainers.image.vendor: OpenStatus - org.opencontainers.image.base.digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 + org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus io.dofigen.version: 2.8.0 + org.opencontainers.image.authors: OpenStatus Team + org.opencontainers.image.vendor: OpenStatus user: user: '1000' group: '1000' @@ -164,17 +163,17 @@ effective: | retries: 3 images: docker.io: - library: - node: - 24-slim: - digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc denoland: deno: 2.9.2: digest: sha256:69a9f3033e3f381770452648b1cbf4ae96ea409f7ef24f30afeff3d380705f62 + library: + node: + 24-slim: + digest: sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d resources: dofigen.yml: - hash: 701b8ce017bf416392a04d9b5c4b5776d55e55b04ebe31f493efd77d7c12fe9f + hash: e26996aaf40dc745e957c15b89a0cfe56bc884ef554207032947b679fef57775 content: | ignore: - node_modules @@ -187,7 +186,6 @@ resources: - /packages/analytics - /packages/api - /packages/error - - /packages/tracker builders: install: fromImage: node:24-slim diff --git a/apps/workflows/dofigen.yml b/apps/workflows/dofigen.yml index e4a81281..b712143a 100644 --- a/apps/workflows/dofigen.yml +++ b/apps/workflows/dofigen.yml @@ -9,7 +9,6 @@ ignore: - /packages/analytics - /packages/api - /packages/error - - /packages/tracker builders: install: fromImage: node:24-slim -- 2.51.2