telegraf: Switch from sed to for loop for parsing groups (#730)

Author: powersj

telegraf/1.28/entrypoint.sh

@@ -14,17 +14,16 @@ else
     # ensure HOME is set to the telegraf user's home dir
     export HOME=$(getent passwd telegraf | cut -d : -f 6)
 
-    # honor groups supplied via 'docker run --group-add ...' but drop 'root' (the sed
-    # removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # honor groups supplied via 'docker run --group-add ...' but drop 'root'
+    # (also removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # see https://github.com/influxdata/influxdata-docker/issues/724
     groups="telegraf"
-    extra_groups="$(id -Gn | sed \
-    -e 's/ /,/g' \
-    -e 's/,\(root\|telegraf\),/,/g' \
-    -e 's/^\(root\|telegraf\),//g'  \
-    -e 's/,\(root\|telegraf\)$//g' \
-    -e 's/^\(root\|telegraf\)$//g')"
-    if [ -n "$extra_groups" ]; then
-        groups="$groups,$extra_groups"
-    fi
+    extra_groups="$(id -Gn || true)"
+    for group in $extra_groups; do
+        case "$group" in
+            root | telegraf) ;;
+            *) groups="$groups,$group" ;;
+        esac
+    done
     exec setpriv --reuid telegraf --regid telegraf --groups "$groups" "$@"
 fi

telegraf/1.29/entrypoint.sh

@@ -14,17 +14,16 @@ else
     # ensure HOME is set to the telegraf user's home dir
     export HOME=$(getent passwd telegraf | cut -d : -f 6)
 
-    # honor groups supplied via 'docker run --group-add ...' but drop 'root' (the sed
-    # removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # honor groups supplied via 'docker run --group-add ...' but drop 'root'
+    # (also removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # see https://github.com/influxdata/influxdata-docker/issues/724
     groups="telegraf"
-    extra_groups="$(id -Gn | sed \
-    -e 's/ /,/g' \
-    -e 's/,\(root\|telegraf\),/,/g' \
-    -e 's/^\(root\|telegraf\),//g'  \
-    -e 's/,\(root\|telegraf\)$//g' \
-    -e 's/^\(root\|telegraf\)$//g')"
-    if [ -n "$extra_groups" ]; then
-        groups="$groups,$extra_groups"
-    fi
+    extra_groups="$(id -Gn || true)"
+    for group in $extra_groups; do
+        case "$group" in
+            root | telegraf) ;;
+            *) groups="$groups,$group" ;;
+        esac
+    done
     exec setpriv --reuid telegraf --regid telegraf --groups "$groups" "$@"
 fi

telegraf/1.30/entrypoint.sh

@@ -14,17 +14,16 @@ else
     # ensure HOME is set to the telegraf user's home dir
     export HOME=$(getent passwd telegraf | cut -d : -f 6)
 
-    # honor groups supplied via 'docker run --group-add ...' but drop 'root' (the sed
-    # removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # honor groups supplied via 'docker run --group-add ...' but drop 'root'
+    # (also removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # see https://github.com/influxdata/influxdata-docker/issues/724
     groups="telegraf"
-    extra_groups="$(id -Gn | sed \
-    -e 's/ /,/g' \
-    -e 's/,\(root\|telegraf\),/,/g' \
-    -e 's/^\(root\|telegraf\),//g'  \
-    -e 's/,\(root\|telegraf\)$//g' \
-    -e 's/^\(root\|telegraf\)$//g')"
-    if [ -n "$extra_groups" ]; then
-        groups="$groups,$extra_groups"
-    fi
+    extra_groups="$(id -Gn || true)"
+    for group in $extra_groups; do
+        case "$group" in
+            root | telegraf) ;;
+            *) groups="$groups,$group" ;;
+        esac
+    done
     exec setpriv --reuid telegraf --regid telegraf --groups "$groups" "$@"
 fi

telegraf/nightly/entrypoint.sh

@@ -14,17 +14,16 @@ else
     # ensure HOME is set to the telegraf user's home dir
     export HOME=$(getent passwd telegraf | cut -d : -f 6)
 
-    # honor groups supplied via 'docker run --group-add ...' but drop 'root' (the sed
-    # removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # honor groups supplied via 'docker run --group-add ...' but drop 'root'
+    # (also removes 'telegraf' since we unconditionally add it and don't want it listed twice)
+    # see https://github.com/influxdata/influxdata-docker/issues/724
     groups="telegraf"
-    extra_groups="$(id -Gn | sed \
-    -e 's/ /,/g' \
-    -e 's/,\(root\|telegraf\),/,/g' \
-    -e 's/^\(root\|telegraf\),//g'  \
-    -e 's/,\(root\|telegraf\)$//g' \
-    -e 's/^\(root\|telegraf\)$//g')"
-    if [ -n "$extra_groups" ]; then
-        groups="$groups,$extra_groups"
-    fi
+    extra_groups="$(id -Gn || true)"
+    for group in $extra_groups; do
+        case "$group" in
+            root | telegraf) ;;
+            *) groups="$groups,$group" ;;
+        esac
+    done
     exec setpriv --reuid telegraf --regid telegraf --groups "$groups" "$@"
 fi