Эх сурвалжийг харах

[toolset] 🔥 Revert "drop permissions of container to match host system (#8007)" (#8013)

* 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
Joan Miquel 2 жил өмнө
parent
commit
918d5ff8e3
2 өөрчлөгдсөн 1 нэмэгдсэн , 8 устгасан
  1. 0 7
      Dockerfile
  2. 1 1
      tfb

+ 0 - 7
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"]

+ 1 - 1
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 "${@}"