refactor: ensure we never grep more than one container id

nginx-proxy · May 4, 2024 · cf43aca · cf43aca
1 parent d110a06
commit cf43aca
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/functions.sh b/app/functions.sh
@@ -199,14 +199,14 @@ function get_self_cid {
 
     # Try the /proc files methods first then resort to the Docker API.
     if [[ -f /proc/1/cpuset ]]; then
-        self_cid="$(grep -Eo '[[:alnum:]]{64}' /proc/1/cpuset)"
+        self_cid="$(grep -Eo -m 1 '[[:alnum:]]{64}' /proc/1/cpuset)"
     fi
     if [[ ( ${#self_cid} != 64 ) && ( -f /proc/self/cgroup ) ]]; then
         self_cid="$(grep -Eo -m 1 '[[:alnum:]]{64}' /proc/self/cgroup)"
     fi
     # cgroups v2
     if [[ ( ${#self_cid} != 64 ) && ( -f /proc/self/mountinfo ) ]]; then
-        self_cid="$(grep '/userdata/hostname' /proc/self/mountinfo | grep -Eo '[[:alnum:]]{64}')"
+        self_cid="$(grep '/userdata/hostname' /proc/self/mountinfo | grep -Eo -m 1 '[[:alnum:]]{64}')"
     fi
     if [[ ( ${#self_cid} != 64 ) ]]; then
         self_cid="$(docker_api "/containers/$(hostname)/json" | jq -r '.Id')"