From 79b80f059990f52f0c58fa1eaebabf09068ed005 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Tue, 18 Feb 2025 15:47:01 +0200 Subject: [PATCH] WIP: Bump subuids/subgids --- Dockerfile | 3 +++ dev_scripts/env.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62f56f8..0a335c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,6 @@ +#FROM alpine + +#RUN touch shite # NOTE: Updating the packages to their latest versions requires bumping the # Dockerfile args below. For more info about this file, read # docs/developer/reproducibility.md. diff --git a/dev_scripts/env.py b/dev_scripts/env.py index ff4e489..9d66138 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -160,8 +160,8 @@ DOCKERFILE_BUILD_DEV = r"""FROM {distro}:{version} # Create a non-root user to run Dangerzone RUN adduser user # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783 -RUN echo user:2000:2000 > /etc/subuid -RUN echo user:2000:2000 > /etc/subgid +RUN echo user:2000:250000 > /etc/subuid +RUN echo user:2000:250000 > /etc/subgid # XXX: We need the empty source folder, so that we can trick Poetry to create a # link to the project's path. This way, we should be able to do `import @@ -456,7 +456,7 @@ class Env: "--uidmap", "0:1:1000", "--uidmap", - "1001:1001:64536", + "1001:1001:251999", ] gidmaps = [ "--gidmap", @@ -464,7 +464,7 @@ class Env: "--gidmap", "0:1:1000", "--gidmap", - "1001:1001:64536", + "1001:1001:251999", ] run_cmd += uidmaps + gidmaps