4d4ae7bb by Adam Heath

Minor speed tweaks to entrypoint.

1 parent 7ca798ec
...@@ -2,20 +2,22 @@ ...@@ -2,20 +2,22 @@
2 2
3 set -e 3 set -e
4 4
5 tool_uid="$(id -u tool)" 5 tool_uid=
6 tool_gid="$(id -g tool)" 6 tool_gid=
7 7
8 adjust_tool_uid_gid() { 8 adjust_tool_uid_gid() {
9 declare usermod_args=() groupmod_args=() 9 declare usermod_args=() groupmod_args=()
10 declare -a new_groups=() 10 declare -a new_groups=()
11 11
12 if [[ $MAP_UID ]]; then 12 if [[ $MAP_UID ]]; then
13 [[ $(id -u tool) -ne $MAP_UID ]] && usermod_args+=(-u $MAP_UID) 13 [[ $tool_uid -ne $MAP_UID ]] && usermod_args+=(-u $MAP_UID)
14 tool_uid="$MAP_UID"
14 fi 15 fi
15 if [[ $MAP_GROUPS ]]; then 16 if [[ $MAP_GROUPS ]]; then
16 set -- $MAP_GROUPS 17 set -- $MAP_GROUPS
17 if [[ $tool_gid -ne $1 ]]; then 18 if [[ $tool_gid -ne $1 ]]; then
18 groupmod_args=(-g "$1") 19 groupmod_args=(-g "$1")
20 tool_gid="$1"
19 fi 21 fi
20 shift 22 shift
21 for group in "$@"; do 23 for group in "$@"; do
...@@ -76,13 +78,14 @@ configure_cache() { ...@@ -76,13 +78,14 @@ configure_cache() {
76 chown -h tool:tool "/home/tool/.cache" 78 chown -h tool:tool "/home/tool/.cache"
77 } 79 }
78 80
79 # TODO: Save /run/user between calls 81 tool_uid="$(id -u tool)"
80 mkdir -p /run/user/$tool_uid 82 tool_gid="$(id -g tool)"
81 83
82 adjust_tool_uid_gid 84 adjust_tool_uid_gid
83 85
84 tool_uid="$(id -u tool)" 86 # TODO: Save /run/user between calls
85 tool_gid="$(id -g tool)" 87 mkdir -p /run/user/$tool_uid
88
86 run_state="/run/user/$tool_uid/inkluster-dev" 89 run_state="/run/user/$tool_uid/inkluster-dev"
87 90
88 if [[ ! -d $run_state ]]; then 91 if [[ ! -d $run_state ]]; then
......