Containers with init (reap zombies), no bot token in Telegram errors

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Richard ZinkandClaude Sonnet 5.5 committed 2026-11-21 20:47:32 +01:00
1 parent f8b85beb70
commit c05e2cb6ef
5 files changed
+20 -3

No files matched your search

+7
View File
@@ -3,6 +3,13 @@
All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/);
until 1.0, minor versions may contain breaking changes.
## [Unreleased]
### Fixed
- **Zombie processes:** the compose files start the containers with `init: true`, so children left behind by agents (Chromium, bwrap, npm) are reaped – a long-running container had collected about 1000 zombies.
- **Telegram:** request errors no longer contain the URL, which includes the bot token, so the token does not end up in the server log.
## [v202611-00077] – 2026-11-20
### Added
+3
View File
@@ -18,6 +18,8 @@ services:
# Pin a version (e.g. :v202611-00001) or follow :latest.
image: git.familie-zink.org/zink/codecraft:${CODECRAFT_VERSION:-latest}
container_name: codecraft
# PID 1 reaps the children the agents leave behind (chromium, bwrap, npm …) instead of keeping them as zombies.
init: true
restart: unless-stopped
# Same UID/GID as the owner of your project files.
user: "${UID:-1000}:${GID:-1000}"
@@ -65,6 +67,7 @@ services:
image: git.familie-zink.org/zink/codecraft:${CODECRAFT_VERSION:-latest}
command: ["testrunner"]
container_name: codecraft-testrunner
init: true
restart: unless-stopped
user: "${UID:-1000}:${GID:-1000}"
# Group that owns /var/run/docker.sock on the host: stat -c %g /var/run/docker.sock
+3
View File
@@ -14,6 +14,8 @@ services:
GIT_COMMIT: ${GIT_COMMIT:-}
image: codecraft:latest
container_name: codecraft
# PID 1 reaps the children the agents leave behind (chromium, bwrap, npm …) instead of keeping them as zombies.
init: true
restart: unless-stopped
# Same UID/GID as the owner of your project files.
user: "${UID:-1000}:${GID:-1000}"
@@ -61,6 +63,7 @@ services:
image: codecraft:latest
command: ["testrunner"]
container_name: codecraft-testrunner
init: true
restart: unless-stopped
user: "${UID:-1000}:${GID:-1000}"
# Group that owns /var/run/docker.sock on the host: stat -c %g /var/run/docker.sock
+3 -3
View File
@@ -130,7 +130,7 @@ impl Bot {
}
async fn call(&self, method: &str, body: Value) -> Result<Value> {
let resp = crate::provider::http_client().post(self.url(method)).timeout(Duration::from_secs(60)).json(&body).send().await.context("telegram request failed")?;
let resp = crate::provider::http_client().post(self.url(method)).timeout(Duration::from_secs(60)).json(&body).send().await.map_err(|e| e.without_url()).context("telegram request failed")?;
let status = resp.status();
let v: Value = resp.json().await.unwrap_or_else(|_| json!({}));
if v["ok"].as_bool() != Some(true) {
@@ -174,7 +174,7 @@ impl Bot {
if let Some(c) = caption {
form = form.text("caption", c.chars().take(1000).collect::<String>());
}
let v: Value = crate::provider::http_client().post(self.url("sendPhoto")).timeout(Duration::from_secs(120)).multipart(form).send().await?.json().await?;
let v: Value = crate::provider::http_client().post(self.url("sendPhoto")).timeout(Duration::from_secs(120)).multipart(form).send().await.map_err(|e| e.without_url())?.json().await.map_err(|e| e.without_url())?;
if v["ok"].as_bool() != Some(true) {
bail!("telegram sendPhoto: {}", v["description"].as_str().unwrap_or("error"));
}
@@ -186,7 +186,7 @@ impl Bot {
let f = self.call("getFile", json!({"file_id": file_id})).await?;
let path = f["file_path"].as_str().context("telegram file without path")?.to_string();
let url = format!("{}/file/bot{}/{path}", api_base(), self.token);
let bytes = crate::provider::http_client().get(url).timeout(Duration::from_secs(120)).send().await?.error_for_status()?.bytes().await?;
let bytes = crate::provider::http_client().get(url).timeout(Duration::from_secs(120)).send().await.map_err(|e| e.without_url())?.error_for_status().map_err(|e| e.without_url())?.bytes().await.map_err(|e| e.without_url())?;
Ok((bytes.to_vec(), path))
}
}
+4
View File
@@ -3,6 +3,10 @@
* under "unreleased"; scripts/release.sh renames the key to the release version.
*/
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
unreleased: {
en: ["Fixed: leftover zombie processes in the container; the Telegram bot token no longer appears in error logs"],
de: ["Behoben: übrig gebliebene Zombie-Prozesse im Container; der Telegram-Bot-Token taucht nicht mehr in Fehlerlogs auf"],
},
"202611-00077": {
en: ["Factory test runner: shared base image (Node 24, Python, gcc, Chromium/Playwright) for acceptance containers; logs start time, cache hits and installed packages"],
de: ["Factory-Test-Runner: gemeinsames Basis-Image (Node 24, Python, gcc, Chromium/Playwright) für Abnahme-Container; protokolliert Startzeit, Cache-Treffer und installierte Pakete"],