From 3ba849bb7c34ec08143b98207facbe5ebfe18fde Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Mon, 31 Mar 2025 19:29:58 +0300 Subject: [PATCH] Update minimum Docker Desktop version Update the minimum Docker Desktop version prior to the 0.9.0 release. The new version should also fix a recent Docker bug, whereby the container stdout was truncated, and caused our conversions to fail. Fixes #1101 --- CHANGELOG.md | 7 ++++++- dangerzone/isolation_provider/container.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98fe879..4d91b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or - Fix our Debian Trixie installation instructions using Sequoia PGP ([#1052](https://github.com/freedomofpress/dangerzone/issues/1052)) - Fix the way multiprocessing works on macOS ([#873](https://github.com/freedomofpress/dangerzone/issues/873)) +- Update minimum Docker Desktop version to fix an stdout truncation issue ([#1101](https://github.com/freedomofpress/dangerzone/issues/1101)) ### Removed @@ -48,7 +49,11 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or container storage will no longer show a tag for this dependency ([#1116](https://github.com/freedomofpress/dangerzone/pull/1116)). Thanks [@sudoforge](https://github.com/sudoforge) for the contribution. -- Update the Dangerzone container image and its dependencies (gVisor, Debian base image, H2Orestart) to the latest versions +- Update the Dangerzone container image and its dependencies (gVisor, Debian base image, H2Orestart) to the latest versions: + * Debian image release: `bookworm-20250317-slim@sha256:1209d8fd77def86ceb6663deef7956481cc6c14a25e1e64daec12c0ceffcc19d` + * Debian snapshots date: `2025-03-31` + * gVisor release date: `2025-03-26` + * H2Orestart plugin: `v0.7.2` (`d09bc5c93fe2483a7e4a57985d2a8d0e4efae2efb04375fe4b59a68afd7241e2`) ### Development changes diff --git a/dangerzone/isolation_provider/container.py b/dangerzone/isolation_provider/container.py index ed810f8..4976732 100644 --- a/dangerzone/isolation_provider/container.py +++ b/dangerzone/isolation_provider/container.py @@ -13,8 +13,8 @@ from .base import IsolationProvider, terminate_process_group TIMEOUT_KILL = 5 # Timeout in seconds until the kill command returns. MINIMUM_DOCKER_DESKTOP = { - "Darwin": "4.36.0", - "Windows": "4.36.0", + "Darwin": "4.40.0", + "Windows": "4.40.0", } # Define startupinfo for subprocesses