mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-01 19:07:45 +08:00
Tools: docker_run.sh fix entrypoint as user
- modern docker can specify the user at runtime (--user)
This commit is contained in:
+1
-1
@@ -47,6 +47,7 @@ CCACHE_DIR=${HOME}/.ccache
|
|||||||
mkdir -p "${CCACHE_DIR}"
|
mkdir -p "${CCACHE_DIR}"
|
||||||
|
|
||||||
docker run -it --rm -w "${SRC_DIR}" \
|
docker run -it --rm -w "${SRC_DIR}" \
|
||||||
|
--user="$(id -u):$(id -g)" \
|
||||||
--env=AWS_ACCESS_KEY_ID \
|
--env=AWS_ACCESS_KEY_ID \
|
||||||
--env=AWS_SECRET_ACCESS_KEY \
|
--env=AWS_SECRET_ACCESS_KEY \
|
||||||
--env=BRANCH_NAME \
|
--env=BRANCH_NAME \
|
||||||
@@ -54,7 +55,6 @@ docker run -it --rm -w "${SRC_DIR}" \
|
|||||||
--env=CI \
|
--env=CI \
|
||||||
--env=CODECOV_TOKEN \
|
--env=CODECOV_TOKEN \
|
||||||
--env=COVERALLS_REPO_TOKEN \
|
--env=COVERALLS_REPO_TOKEN \
|
||||||
--env=LOCAL_USER_ID="$(id -u)" \
|
|
||||||
--env=PX4_ASAN \
|
--env=PX4_ASAN \
|
||||||
--env=PX4_MSAN \
|
--env=PX4_MSAN \
|
||||||
--env=PX4_TSAN \
|
--env=PX4_TSAN \
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo "[docker-entrypoint.sh] Starting entrypoint"
|
|
||||||
# Start virtual X server in the background
|
# Start virtual X server in the background
|
||||||
# - DISPLAY default is :99, set in dockerfile
|
# - DISPLAY default is :99, set in dockerfile
|
||||||
# - Users can override with `-e DISPLAY=` in `docker run` command to avoid
|
# - Users can override with `-e DISPLAY=` in `docker run` command to avoid
|
||||||
@@ -17,17 +16,4 @@ if [ -n "${ROS_DISTRO}" ]; then
|
|||||||
source "/opt/ros/$ROS_DISTRO/setup.bash"
|
source "/opt/ros/$ROS_DISTRO/setup.bash"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[docker-entrypoint.sh] Working Directory: ${pwd}"
|
exec "$@"
|
||||||
|
|
||||||
# Use the LOCAL_USER_ID if passed in at runtime
|
|
||||||
if [ -n "${LOCAL_USER_ID}" ]; then
|
|
||||||
echo "[docker-entrypoint.sh] Starting with: $LOCAL_USER_ID:user"
|
|
||||||
# modify existing user's id
|
|
||||||
usermod -u $LOCAL_USER_ID user
|
|
||||||
|
|
||||||
# run as user
|
|
||||||
# exec gosu user "$@"
|
|
||||||
exec "$@"
|
|
||||||
else
|
|
||||||
exec "$@"
|
|
||||||
fi
|
|
||||||
|
|||||||
Reference in New Issue
Block a user