arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-18 06:18:08 +00:00
Code Issues Releases Wiki Activity

Improvement of support for docker USER directive. Fixes #1727.

Browse Source
This commit is contained in:
grossmj 2020-03-19 17:50:27 +10:30
parent 6aed064a86
commit aa1b621c10
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/compute/docker/resources/init.sh
View File

@ -87,9 +87,5 @@ done
ifup -a -f
# continue normal docker startup
GNS3_CMD="PATH=$OLD_PATH exec"
while test "$#" -gt 0 ; do
GNS3_CMD="${GNS3_CMD} \"${1//\"/\\\"}\""
shift
done
exec su ${GNS3_USER-root} -p -c "$GNS3_CMD"
eval HOME=$(echo ~${GNS3_USER-root})
exec su ${GNS3_USER-root} -p -- /gns3/run-cmd.sh "$OLD_PATH" "$@"

6
gns3server/compute/docker/resources/run-cmd.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
# run docker startup, first arg is new PATH, remainder is command
PATH="$1"
shift
exec "$@"