From 72ddbfd55ad215d511fc31acafc79fc521f0236d Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Tue, 30 Jan 2024 13:56:48 +0200 Subject: [PATCH] dev_scripts: Install a subset of Podman deps Install a subset of Podman dependencies, so that we don't also install Systemd. Doing so can introduce some subtle issues of its own, which is why we prefer cherry-picking the Podman packages we really need. Fixes #689 --- dev_scripts/env.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev_scripts/env.py b/dev_scripts/env.py index 206640e..489b58a 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -82,10 +82,12 @@ DOCKERFILE_BUILD_DEV_DEBIAN_DEPS = r""" ARG DEBIAN_FRONTEND=noninteractive # NOTE: Podman has several recommended packages that are actually essential for rootless -# containers. Instead of specifying them by name, we can install Podman with all of its -# recommendations, which increases the image size, but makes the environment less flaky. +# containers. However, certain Podman versions (e.g., in Debian Trixie) bring Systemd in +# as a recommended dependency. The latter is a cause for problems, so we prefer to +# install only a subset of the recommended Podman packages. See also: +# https://github.com/freedomofpress/dangerzone/issues/689 RUN apt-get update \ - && apt-get install -y podman \ + && apt-get install -y --no-install-recommends podman uidmap slirp4netns \ && rm -rf /var/lib/apt/lists/* RUN apt-get update \ && apt-get install -y --no-install-recommends dh-python make build-essential \