Fix when docker socket group id points to an existing group in container (#20288)
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Felipe Santos committed
May 18, 2025 at 04:19 UTC
fba56c7ab24671583fce638fb6d40d8466e1ebe7
1 file changed
+9
-9
packaging/docker/run.sh
+9
-9
@@ -17,16 +17,16 @@ function add_netdata_to_proxmox_conf_files_group() {
17
18
if ! getent group "${group_guid}" >/dev/null; then
19
echo "Creating proxmox-etc-pve group with GID ${group_guid}"
20
- if ! addgroup -g "${group_guid}" "proxmox-etc-pve"; then
20
+ if ! addgroup --gid "${group_guid}" "proxmox-etc-pve"; then
21
echo >&2 "Failed to add group proxmox-etc-pve with GID ${group_guid}."
22
return
23
fi
24
fi
25
26
- if ! getent group "${group_guid}" | grep -q netdata; then
27
- echo "Assign netdata user to group ${group_guid}"
28
- if ! usermod -a -G "${group_guid}" "${DOCKER_USR}"; then
29
- echo >&2 "Failed to add netdata user to group with GID ${group_guid}."
26
+ if ! getent group "${group_guid}" | grep -q "${DOCKER_USR}"; then
27
+ echo "Assigning ${DOCKER_USR} user to group ${group_guid}"
28
+ if ! usermod --apend --groups "${group_guid}" "${DOCKER_USR}"; then
29
+ echo >&2 "Failed to add ${DOCKER_USR} user to group with GID ${group_guid}."
30
return
31
fi
32
fi
@@ -79,10 +79,10 @@ if [ "${EUID}" -eq 0 ]; then
79
export DOCKER_HOST
80
81
if [ -n "${PGID}" ]; then
82
- echo "Creating docker group ${PGID}"
83
- addgroup --gid "${PGID}" "docker" || echo >&2 "Could not add group docker with ID ${PGID}, its already there probably"
84
- echo "Assign netdata user to docker group ${PGID}"
85
- usermod --append --groups "docker" "${DOCKER_USR}" || echo >&2 "Could not add netdata user to group docker with ID ${PGID}"
82
+ echo "Creating docker group with GID ${PGID}"
83
+ addgroup --gid "${PGID}" "docker" || echo >&2 "Failed to add group docker with GID ${PGID}, probably one already exists."
84
+ echo "Assigning ${DOCKER_USR} user to group with GID ${PGID}"
85
+ usermod --append --groups "${PGID}" "${DOCKER_USR}" || echo >&2 "Failed to add ${DOCKER_USR} user to group with GID ${PGID}."
86
fi
87
88
if [ -d "/host/etc/pve" ]; then