From b7f803076545d67aab6f71ea778f3394a760d8e3 Mon Sep 17 00:00:00 2001
From: Joanhey <joanhey@kumbiaphp.com>
Date: Sat, 11 Mar 2023 17:48:29 +0100
Subject: [PATCH 1/3] Revert "drop permissions of container to match host
 system (#8007)"

This reverts commit 1cf4924886c518cb192fbe50ac392a4a8459a98d.
---
 Dockerfile | 7 -------
 tfb        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba6f5df7a01..b9854ebc9df 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 1a76528d8a9..9f679dd489a 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 "${@}"

From a558c9fa2ff024ef23c4dad170919de1138223fa Mon Sep 17 00:00:00 2001
From: Joanhey <joanhey@kumbiaphp.com>
Date: Sat, 11 Mar 2023 18:14:34 +0100
Subject: [PATCH 2/3] [ci lang-only php] To test CI

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b9854ebc9df..8578c051d4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get -yqq update && apt-get -yqq install \
       -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
       cloc \
-      dstat                       `# Collect resource usage statistics` \
+      dstat                       `# Collect resource usage statistics ` \
       git-core \
       libmysqlclient-dev          `# Needed for MySQL-python` \
       libpq-dev \

From 99a2f6ef2bf8bc9b2a785e1dce07ac4f06833d5b Mon Sep 17 00:00:00 2001
From: Joanhey <joanhey@kumbiaphp.com>
Date: Sat, 11 Mar 2023 18:18:15 +0100
Subject: [PATCH 3/3] [ci run-all] To test CI

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8578c051d4e..b9854ebc9df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get -yqq update && apt-get -yqq install \
       -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
       cloc \
-      dstat                       `# Collect resource usage statistics ` \
+      dstat                       `# Collect resource usage statistics` \
       git-core \
       libmysqlclient-dev          `# Needed for MySQL-python` \
       libpq-dev \