From 098e532bd2a2299c27ec2502cb0f36c070d68f29 Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Thu, 17 Aug 2023 15:15:30 +0300
Subject: [PATCH] dev_scripts: Ditch sudo requirement for Docker

We don't tend to use Docker for development tasks in Linux, since we
have Podman for that. In MacOS and Windows, we do use Docker, but
typically without sudo.

Make our MacOS / Windows dev tasks non-interactive, by ditching the
`sudo` invocation.

Closes #519
---
 dev_scripts/env.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev_scripts/env.py b/dev_scripts/env.py
index f874478..c728bd7 100755
--- a/dev_scripts/env.py
+++ b/dev_scripts/env.py
@@ -261,11 +261,8 @@ class Env:
             self.version = "bullseye-backports"
 
         # Try to autodetect the runtime, if the user has not provided it.
-        #
-        # FIXME: Typically Podman runs without sudo, whereas Docker with sudo, but this
-        # is not always the case. We may need to autodetect that as well.
         podman_cmd = ["podman"]
-        docker_cmd = ["sudo", "docker"]
+        docker_cmd = ["docker"]
         if not runtime:
             if shutil.which("podman"):
                 self.runtime = "podman"