Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Mar 13, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7f8030
Revert "drop permissions of container to match host system (#8007)"
joanhey Mar 11, 2023
a558c9f
[ci lang-only php] To test CI
joanhey Mar 11, 2023
99a2f6e
[ci run-all] To test CI
joanhey Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion tfb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "${@}"