From 280af152c035d6d31f25a3286de093b9e173893c Mon Sep 17 00:00:00 2001
From: Joan Miquel <joanhey@kumbiaphp.com>
Date: Mon, 13 Mar 2023 16:30:16 +0100
Subject: [PATCH] =?UTF-8?q?[toolset]=20=F0=9F=94=A5=20Revert=20"drop=20per?=
 =?UTF-8?q?missions=20of=20container=20to=20match=20host=20system=20(#8007?=
 =?UTF-8?q?)"=20(#8013)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "drop permissions of container to match host system (#8007)"

This reverts commit 1cf4924886c518cb192fbe50ac392a4a8459a98d.

* [ci lang-only php] To test CI

* [ci run-all] To test CI
---
 Dockerfile | 7 -------
 tfb        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba6f5df7a010..b9854ebc9dfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM ubuntu:18.04
 
-ARG USER_ID
-ARG GROUP_ID
 ARG DEBIAN_FRONTEND=noninteractive
 # WARNING: DON'T PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
 # One -q produces output suitable for logging (mostly hides
@@ -31,9 +29,4 @@ RUN apt-get -yqq update && apt-get -yqq install \
 
 ENV FWROOT=/FrameworkBenchmarks PYTHONPATH=/FrameworkBenchmarks
 
-# Drop permissions of user to match those of the host system
-RUN addgroup --gid $GROUP_ID user
-RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user
-USER user
-
 ENTRYPOINT ["python", "/FrameworkBenchmarks/toolset/run-tests.py"]
diff --git a/tfb b/tfb
index 1a76528d8a9b..9f679dd489ad 100755
--- a/tfb
+++ b/tfb
@@ -102,5 +102,5 @@ if ! docker network inspect tfb >/dev/null 2>&1; then
 fi
 
 test -t 1 && USE_TTY="-t"
-docker build -t techempower/tfb --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) - < ${SCRIPT_ROOT}/Dockerfile
+docker build -t techempower/tfb - < ${SCRIPT_ROOT}/Dockerfile
 exec docker run -i ${USE_TTY} ${EXTRA_DOCKER_ARGS} --rm --network tfb -v /var/run/docker.sock:/var/run/docker.sock -v ${SCRIPT_ROOT}:/FrameworkBenchmarks techempower/tfb "${@}"