From 0928ec3d2af02183be420fd68d1ac627d035b226 Mon Sep 17 00:00:00 2001 From: merge-check <140916359+agentHits@users.noreply.github.com> Date: Mon, 16 Nov 2026 05:17:50 -0500 Subject: [PATCH 1/2] chore(security): record the 2026-11-16 recheck of the zlib1g findings in the pinned Postgres image The scheduled image audit failed on 9 and 10 November because the official postgres and redis Debian images ship zlib1g 1:1.3.dfsg+really1.3.1-1+b1 with CVE-2026-76844 and CVE-2026-85091, which Debian fixed in +deb13u1. TaskFlow-Systems/dokploy#266 ignored both findings until 2026-11-20, TaskFlow-Systems/dokploy#270 moved the panel's Redis to redis:8.10.3-alpine and TaskFlow-Systems/dokploy#271 moved Postgres to 18.7; the audit has been green since 2026-11-13. Rechecked on 2026-11-16: postgres:18.7 (index sha256:2ea8630d..., built 2026-11-12) and redis:8.10.3 (Debian, built 2026-11-05) still carry the old zlib1g; there is no postgres 18.8 or redis 8.10.4. redis:8.10.3-alpine has zlib 1.3.2-r1 and scans clean. A scan of postgres:18.7 with the workflow's pinned Trivy and the gosu skip passes, the two zlib1g findings ignored. So the pins stay, and the ignore entries keep their 2026-11-20 expiry, after which the audit goes red and the image is checked again. - .trivyignore.yaml: the zlib1g statements say the 2026-11-12 rebuild still ships the old version and when that was checked. - image-audit.yml: the gosu comment names the image it is about now (postgres 18.7, rebuilt 2026-11-12, gosu 1.19 on Go 1.24.6). - docs/agenthits-install.md, docs/server-components-update.md: the installer defaults read postgres:18.7 and traefik:v3.7.19 as in install-agenthits.sh, not 18.6 and v3.7.17. - CLAUDE.md and docs/server-components-update.md: Postgres and Redis are pinned by tag only. A same-tag rebuild reaches new installs, which pull the tag, but not a panel updated with the installer, which replaces dokploy-postgres and dokploy-redis only when the tag changes, and pins-update.sh follows new tags, not rebuilds. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/image-audit.yml | 2 +- .trivyignore.yaml | 4 ++-- CLAUDE.md | 2 +- docs/agenthits-install.md | 4 ++-- docs/server-components-update.md | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/image-audit.yml b/.github/workflows/image-audit.yml index cf5bc3c15e..846bd8f6b4 100644 --- a/.github/workflows/image-audit.yml +++ b/.github/workflows/image-audit.yml @@ -88,7 +88,7 @@ jobs: - name: traefik - name: postgres # gosu only switches to the postgres user when the container - # starts. The Postgres 18.6 image, rebuilt on 2026-10-31, still ships gosu + # starts. The Postgres 18.7 image, rebuilt on 2026-11-12, still ships gosu # 1.19, built with Go 1.24.6; its 26 Go stdlib advisories would # each need an entry in .trivyignore.yaml. gosu 1.20 came out on # 2026-10-25, so the skip ends with the date below and the scan diff --git a/.trivyignore.yaml b/.trivyignore.yaml index 1c39d3b6f4..4eed4fda9f 100644 --- a/.trivyignore.yaml +++ b/.trivyignore.yaml @@ -35,10 +35,10 @@ vulnerabilities: - id: CVE-2026-76844 purls: - pkg:deb/debian/zlib1g@1.3.dfsg%2Breally1.3.1-1%2Bb1 - statement: postgres 18.7, the latest official image, ships zlib1g 1:1.3.dfsg+really1.3.1-1+b1; Debian's fix 1-1+deb13u1 (DSA-6613-1) waits for their rebuild. Images built here take it through apt-get upgrade, so the entry matches only the old version. + statement: postgres 18.7, the latest official image, ships zlib1g 1:1.3.dfsg+really1.3.1-1+b1, and so does its rebuild of 2026-11-12 (rechecked 2026-11-16, no 18.8 yet); Debian's fix 1-1+deb13u1 (DSA-6613-1) waits for their next rebuild. Images built here take it through apt-get upgrade, so the entry matches only the old version. expired_at: 2026-11-20 - id: CVE-2026-85091 purls: - pkg:deb/debian/zlib1g@1.3.dfsg%2Breally1.3.1-1%2Bb1 - statement: postgres 18.7, the latest official image, ships zlib1g 1:1.3.dfsg+really1.3.1-1+b1; Debian's fix 1-1+deb13u1 (DSA-6613-1) waits for their rebuild. Images built here take it through apt-get upgrade, so the entry matches only the old version. + statement: postgres 18.7, the latest official image, ships zlib1g 1:1.3.dfsg+really1.3.1-1+b1, and so does its rebuild of 2026-11-12 (rechecked 2026-11-16, no 18.8 yet); Debian's fix 1-1+deb13u1 (DSA-6613-1) waits for their next rebuild. Images built here take it through apt-get upgrade, so the entry matches only the old version. expired_at: 2026-11-20 diff --git a/CLAUDE.md b/CLAUDE.md index 246096022c..8711fbc23c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -196,7 +196,7 @@ One GitHub release `agenthits-vX.Y.Z` covers a batch of work, not a single PR (o - New versions are taken as soon as they are published, for packages and for the tools in the images alike: the owner dropped the one-day release age on 2026-11-06. Do not set Bun's `minimumReleaseAge` or `--minimum-release-age` again, and do not hold back a release because it is new. - A commit pushed to the branch of the open PR stops its daily rebuild until the PR is merged or closed. - `.github/workflows/dependency-audit.yml` runs `bun audit` every Monday for advisories published between updates. -- `.github/workflows/pins-auto-update.yml` runs every day at 03:30 UTC and keeps one PR `chore(deps): update pinned images and tools` from `deps/pins-auto-update`, with the checks started as for the npm PR. `.github/scripts/pins-update.sh` raises the Node base image (a new release, or a new digest of the same tag: Node's images are rebuilt for Debian updates), Bun, the Docker CLI and engine (only a version that exists for Debian 13 and Ubuntu 24.04, amd64 and arm64), rclone, Nixpacks, pack, Traefik, Postgres and Redis to the newest release in range: same major, patches only for Traefik, Redis and 0.x tools. It lists newer releases outside the range, and every Railpack release, in the PR for a manual one: Railpack's default for new applications is a migration and mise must follow it. The workflow token cannot change `.github/workflows/`, so workflows hold no versions: `setup-bun` reads `packageManager`, `setup-node` reads `.nvmrc`, `pull-request.yml` reads Nixpacks, Railpack and mise from `Dockerfile`, and `image-audit.yml` its images from `install-agenthits.sh`; `component-versions-sync.test.ts` fails on a version written into a workflow. +- `.github/workflows/pins-auto-update.yml` runs every day at 03:30 UTC and keeps one PR `chore(deps): update pinned images and tools` from `deps/pins-auto-update`, with the checks started as for the npm PR. `.github/scripts/pins-update.sh` raises the Node base image (a new release, or a new digest of the same tag: Node's images are rebuilt for Debian updates), Bun, the Docker CLI and engine (only a version that exists for Debian 13 and Ubuntu 24.04, amd64 and arm64), rclone, Nixpacks, pack, Traefik, Postgres and Redis to the newest release in range: same major, patches only for Traefik, Redis and 0.x tools. It lists newer releases outside the range, and every Railpack release, in the PR for a manual one: Railpack's default for new applications is a migration and mise must follow it. The workflow token cannot change `.github/workflows/`, so workflows hold no versions: `setup-bun` reads `packageManager`, `setup-node` reads `.nvmrc`, `pull-request.yml` reads Nixpacks, Railpack and mise from `Dockerfile`, and `image-audit.yml` its images from `install-agenthits.sh`; `component-versions-sync.test.ts` fails on a version written into a workflow. Postgres and Redis are pinned by tag only, and the script follows new tags, not rebuilds of the same tag: a rebuild reaches new installs, which pull the tag, but not a panel updated with the installer, which replaces `dokploy-postgres` and `dokploy-redis` only when the tag changes. - The base stage of every Dockerfile runs `apt-get upgrade`, and `agenthits-image.yml` passes `DEBIAN_UPDATES_DAY` (the UTC date), because the registry build cache kept that layer, and with it every Debian fix, until the base digest changed. The first build of a day therefore rebuilds every stage. When the daily scan of the published image finds a Debian package with a fix, it starts `agenthits-image.yml` on `AgentHits-Dev`, and that build is scanned too; deploying it stays a manual step. - `bun audit` does not see the image. Trivy scans the published `agenthits-dev` image and the pinned Traefik, Postgres and Redis images every day (`.github/workflows/image-audit.yml`), each `agenthits-dev-` build once the release workflow has pushed it (same workflow), and the image a PR builds (`bun-migration-docker-check.yml`). All of them run `.github/scripts/trivy-image-scan.sh`, which writes the findings to the job summary, and fail on critical and high findings that have a fix in Debian packages, in the Go binaries of the bundled tools (Docker CLI, rclone, Railpack, pack) or in npm packages inside the image. `.trivyignore.yaml` holds findings whose latest tool release still carries them; each entry expires, so the audit fails again and the tool gets rechecked. Trivy is pinned by digest in both workflows; move them together. The organization's self-hosted Linux runners take no public repositories, so these scans run on GitHub-hosted runners. diff --git a/docs/agenthits-install.md b/docs/agenthits-install.md index 4e1d89b7d0..a7d141b116 100644 --- a/docs/agenthits-install.md +++ b/docs/agenthits-install.md @@ -48,8 +48,8 @@ Installer сам определяет систему: ```text Dokploy: ghcr.io/agenthits/dokploy:agenthits-dev -Traefik: traefik:v3.7.17 -Postgres: postgres:18.6 +Traefik: traefik:v3.7.19 +Postgres: postgres:18.7 Redis: redis:8.10.3-alpine ``` diff --git a/docs/server-components-update.md b/docs/server-components-update.md index b4763bc68d..e6271c477b 100644 --- a/docs/server-components-update.md +++ b/docs/server-components-update.md @@ -18,7 +18,7 @@ | Node.js (базовый образ панели и CI) | 26.13.0 | `node:26.13.0-trixie-slim` (Debian 13), закреплён по digest; первый LTS-релиз ветки 26 (Lithium, 2026-10-28) | | Docker Engine | 29.9.3 | docker-ce для noble и resolute, amd64 и arm64; в образе панели только docker-ce-cli для trixie | | Traefik | 3.7.17 | последний стабильный релиз (GitHub), образ `traefik:v3.7.17`; с этой версии собран на Go 1.27 | -| Postgres (база панели) | 18.6 | `postgres:18.6`, более новых тегов 18.x нет | +| Postgres (база панели) | 18.7 | `postgres:18.7`, более новых тегов 18.x нет; сборка 2026-11-12 несёт zlib1g `1-1+b1` с двумя исправленными в Debian high CVE, они в `.trivyignore.yaml` до 2026-11-20 | | Redis (база панели) | 8.10.3 | `redis:8.10.3-alpine`: Debian-теги redis 8.x на 2026-11-13 неделю не пересобирались и несли старый zlib1g, Alpine-вариант чистый; бот версий берёт только версии с тегом `-alpine` | | Nixpacks | 1.41.0 | последний релиз | | Railpack | 0.43.0 | образ фронтенда `railpack-frontend:v0.43.0`; с этой версии проекты без `.dockerignore` и своих исключений не кладут в контекст сборки `node_modules` (Node, Deno) и `venv`/`.venv` (Python) | @@ -55,4 +55,5 @@ Postgres и Redis относятся к базе панели. На сервер - Версия Railpack у каждого приложения хранится в базе (колонка `railpackVersion`). Новое значение по умолчанию — 0.43.0 (миграция `railpack_default_0_43_0`). Существующие приложения сохраняют свою версию, миграция её не меняет. - Версии Dokploy (`DOKPLOY_OFFICIAL_VERSION`, сейчас v0.29.8) и npm-зависимости в этот список не входят. - Обновление Traefik и Docker проверено тестами с подменёнными командами docker, apt-get, apt-cache и curl. Полный прогон с приложениями на живом сервере не выполнялся. +- Postgres и Redis закреплены только тегом. Официальные образы пересобирают под тем же тегом, когда Debian выпускает исправления: новая установка скачивает тег и получает пересборку, а обновление панели установщиком скачивает тег заново, но меняет сервисы `dokploy-postgres` и `dokploy-redis` только при смене тега, поэтому работающая панель остаётся на прежней сборке до следующего тега. - Предварительная загрузка пакетов Docker работает только на хостах с apt. Если в apt-репозиториях нет закреплённой версии Docker, обновление останавливается до любых изменений. From 1586fa65c3c643789c9266bcda3fe84490c43862 Mon Sep 17 00:00:00 2001 From: merge-check <140916359+agentHits@users.noreply.github.com> Date: Mon, 16 Nov 2026 05:29:47 -0500 Subject: [PATCH 2/2] test(swarm): accept the early restart-loop failure in the unchanged-update crash test Since TaskFlow-Systems/dokploy#211 a restart loop fails as soon as one slot has three failed tasks. "fails when an update changes nothing and the service keeps crashing" still expected the limit's message only, so it failed whenever the runner saw the third crash before the limit: pr-check (docker-1) on TaskFlow-Systems/dokploy#275 did. Both messages are right for this case; the test now takes either, and still requires the task's own `non-zero exit (3)`. Co-Authored-By: Claude Opus 5.5 --- .../__test__/docker/swarm-convergence.real.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/__test__/docker/swarm-convergence.real.test.ts b/apps/dokploy/__test__/docker/swarm-convergence.real.test.ts index 29a0f92f4f..04165013ba 100644 --- a/apps/dokploy/__test__/docker/swarm-convergence.real.test.ts +++ b/apps/dokploy/__test__/docker/swarm-convergence.real.test.ts @@ -72,7 +72,7 @@ describe("waitForSwarmServiceConvergence on real Docker", () => { await expect( waitForSwarmServiceConvergence(redis.appName, null, limit), ).rejects.toThrow( - /keeps failing: 3 tasks of one slot in this update have failed \(last task error: .*non-zero exit \(3\)/, + /keeps failing: \d+ tasks of one slot in this update have failed \(last task error: .*non-zero exit \(3\)/, ); expect(Date.now() - startedAt).toBeLessThan(limit.timeoutMs); await removeCrashing(redis.appName); @@ -170,9 +170,13 @@ describe("waitForSwarmServiceConvergence on real Docker", () => { await buildLibsql(libsql); + // Which comes first depends on the runner: the third crash of the slot + // or the limit. Both must name the task's own exit. await expect( waitForSwarmServiceConvergence(libsql.appName, null, CATCHES_EVERY_RUN), - ).rejects.toThrow(/0\/1 tasks stayed running.*non-zero exit \(3\)/); + ).rejects.toThrow( + /(0\/1 tasks stayed running|keeps failing: \d+ tasks of one slot).*non-zero exit \(3\)/, + ); expect((await inspect(libsql.appName)).UpdateStatus).toBeUndefined(); await removeCrashing(libsql.appName); },