From 1b8e43bec815bcff7562f2fa72822e8ac5a6da50 Mon Sep 17 00:00:00 2001
From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:53:06 -0700
Subject: [PATCH] Fix Linux build permissions

---
 reproducible-builds/Dockerfile | 11 -----------
 reproducible-builds/build.sh   |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 180dab23e91c..6e68b223bf4e 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -11,11 +11,6 @@ ENV SOURCE_DATE_EPOCH=0
 # as an environment variable and use that instead.
 ARG NODE_VERSION
 
-# User for building. electron-builder works better when not running as root.
-ARG USERNAME=signaluser
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
 ENV SIGNAL_ENV=production
 
 # ---
@@ -57,12 +52,6 @@ RUN git config --global --add safe.directory /project
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
-# Use non-root user for build.
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
-
-USER $USERNAME
-
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 # Specify build type using CMD, which affects the app version and name of the resulting package.
diff --git a/reproducible-builds/build.sh b/reproducible-builds/build.sh
index 0cfa882e030e..ffcebf91673b 100755
--- a/reproducible-builds/build.sh
+++ b/reproducible-builds/build.sh
@@ -33,4 +33,4 @@ fi
 # Perform the build by mounting the project into the container and passing in the 1st command line
 # arg to select the build type (e.g. "public"). The container runs docker-entrypoint.sh.
 # After the process is finished, the resulting package is located in the ./release/ directory.
-docker run --rm -v "$(pwd)":/project -w /project --user "$(id -u):$(id -g)" -e SOURCE_DATE_EPOCH=$source_date_epoch signal-desktop $1
+docker run --rm -v "$(pwd)":/project -w /project -e SOURCE_DATE_EPOCH=$source_date_epoch signal-desktop $1