WIP: Bump subuids/subgids
Some checks failed
Build dev environments / Build dev-env (debian-bookworm) (push) Has been cancelled
Build dev environments / Build dev-env (debian-bullseye) (push) Has been cancelled
Build dev environments / Build dev-env (debian-trixie) (push) Has been cancelled
Build dev environments / Build dev-env (fedora-40) (push) Has been cancelled
Build dev environments / Build dev-env (fedora-41) (push) Has been cancelled
Build dev environments / Build dev-env (ubuntu-20.04) (push) Has been cancelled
Build dev environments / Build dev-env (ubuntu-22.04) (push) Has been cancelled
Build dev environments / Build dev-env (ubuntu-24.04) (push) Has been cancelled
Build dev environments / Build dev-env (ubuntu-24.10) (push) Has been cancelled
Build dev environments / build-container-image (push) Has been cancelled
Tests / run-lint (push) Has been cancelled
Tests / build-container-image (push) Has been cancelled
Tests / Download and cache Tesseract data (push) Has been cancelled
Tests / check-reproducibility (push) Has been cancelled
Release multi-arch container image / build (linux/amd64) (push) Has been cancelled
Release multi-arch container image / build (linux/arm64) (push) Has been cancelled
Tests / windows (push) Has been cancelled
Tests / macOS (arch64) (push) Has been cancelled
Tests / macOS (x86_64) (push) Has been cancelled
Tests / build-deb (debian bookworm) (push) Has been cancelled
Tests / build-deb (debian bullseye) (push) Has been cancelled
Tests / build-deb (debian trixie) (push) Has been cancelled
Tests / build-deb (ubuntu 20.04) (push) Has been cancelled
Tests / build-deb (ubuntu 22.04) (push) Has been cancelled
Tests / build-deb (ubuntu 24.04) (push) Has been cancelled
Tests / build-deb (ubuntu 24.10) (push) Has been cancelled
Tests / install-deb (debian bookworm) (push) Has been cancelled
Tests / install-deb (debian bullseye) (push) Has been cancelled
Tests / install-deb (debian trixie) (push) Has been cancelled
Tests / install-deb (ubuntu 20.04) (push) Has been cancelled
Tests / install-deb (ubuntu 22.04) (push) Has been cancelled
Tests / install-deb (ubuntu 24.04) (push) Has been cancelled
Tests / install-deb (ubuntu 24.10) (push) Has been cancelled
Tests / build-install-rpm (fedora 40) (push) Has been cancelled
Tests / build-install-rpm (fedora 41) (push) Has been cancelled
Tests / run tests (debian bookworm) (push) Has been cancelled
Tests / run tests (debian bullseye) (push) Has been cancelled
Tests / run tests (debian trixie) (push) Has been cancelled
Tests / run tests (fedora 40) (push) Has been cancelled
Tests / run tests (fedora 41) (push) Has been cancelled
Tests / run tests (ubuntu 20.04) (push) Has been cancelled
Tests / run tests (ubuntu 22.04) (push) Has been cancelled
Tests / run tests (ubuntu 24.04) (push) Has been cancelled
Tests / run tests (ubuntu 24.10) (push) Has been cancelled
Release multi-arch container image / merge (push) Has been cancelled
Release multi-arch container image / provenance (push) Has been cancelled

This commit is contained in:
Alex Pyrgiotis 2025-02-18 15:47:01 +02:00
parent ce5ff0d560
commit 79b80f0599
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 7 additions and 4 deletions

View file

@ -1,3 +1,6 @@
#FROM alpine
#RUN touch shite
# NOTE: Updating the packages to their latest versions requires bumping the # NOTE: Updating the packages to their latest versions requires bumping the
# Dockerfile args below. For more info about this file, read # Dockerfile args below. For more info about this file, read
# docs/developer/reproducibility.md. # docs/developer/reproducibility.md.

View file

@ -160,8 +160,8 @@ DOCKERFILE_BUILD_DEV = r"""FROM {distro}:{version}
# Create a non-root user to run Dangerzone # Create a non-root user to run Dangerzone
RUN adduser user RUN adduser user
# See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783 # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783
RUN echo user:2000:2000 > /etc/subuid RUN echo user:2000:250000 > /etc/subuid
RUN echo user:2000:2000 > /etc/subgid RUN echo user:2000:250000 > /etc/subgid
# XXX: We need the empty source folder, so that we can trick Poetry to create a # 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 # link to the project's path. This way, we should be able to do `import
@ -456,7 +456,7 @@ class Env:
"--uidmap", "--uidmap",
"0:1:1000", "0:1:1000",
"--uidmap", "--uidmap",
"1001:1001:64536", "1001:1001:251999",
] ]
gidmaps = [ gidmaps = [
"--gidmap", "--gidmap",
@ -464,7 +464,7 @@ class Env:
"--gidmap", "--gidmap",
"0:1:1000", "0:1:1000",
"--gidmap", "--gidmap",
"1001:1001:64536", "1001:1001:251999",
] ]
run_cmd += uidmaps + gidmaps run_cmd += uidmaps + gidmaps