diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-11-28 07:28:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 14:28:54 +0200 |
| commit | d8e2aff0aeda820c9603bf63de1c91e65b37811f (patch) | |
| tree | 2490a5393fe702a78cacc95b94b33d978d60f4f6 /netdata-installer.sh | |
| parent | 16926d80fcdb901ea49cb530b9f494412d15b214 (diff) | |
Switch to using Debian as a base for our Docker images. (#15823)
* Update Dockerfile to properly work with Debian base images.
* add missing setuid plugins
* add systemd-journal
* disable building ebpf in Docker
* Fix docker group handling.
* fix "no such user"/" No such file or directory" warning
* fix netdata group and rm nut from docs
* fix missing systemd-cat-native
---------
Co-authored-by: ilyam8 <ilya@netdata.cloud>
Co-authored-by: Tasos Katsoulas <12612986+tkatsoulas@users.noreply.github.com>
Diffstat (limited to 'netdata-installer.sh')
| -rwxr-xr-x | netdata-installer.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh index 3f533c31b9..fb061c09b8 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -1104,7 +1104,7 @@ else NETDATA_USER="${USER}" ROOT_USER="${USER}" fi -NETDATA_GROUP="$(id -g -n "${NETDATA_USER}")" +NETDATA_GROUP="$(id -g -n "${NETDATA_USER}" 2> /dev/null)" [ -z "${NETDATA_GROUP}" ] && NETDATA_GROUP="${NETDATA_USER}" echo >&2 "Netdata user and group set to: ${NETDATA_USER}/${NETDATA_GROUP}" @@ -1177,7 +1177,7 @@ if [ "$(id -u)" -eq 0 ]; then # shellcheck disable=SC2086 portable_add_user_to_group ${g} netdata && NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS} ${g}" done - # Netdata must be able to read /etc/pve/qemu-server/* and /etc/pve/lxc/* + # Netdata must be able to read /etc/pve/qemu-server/* and /etc/pve/lxc/* # for reading VMs/containers names, CPU and memory limits on Proxmox. if [ -d "/etc/pve" ]; then portable_add_user_to_group "www-data" netdata && NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS} www-data" @@ -1344,7 +1344,7 @@ if [ "$(id -u)" -eq 0 ]; then if ! iscontainer && command -v setcap 1> /dev/null 2>&1; then run chmod 0750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin" if run setcap cap_dac_read_search+ep "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/systemd-journal.plugin"; then - capabilities=1 + capabilities=1 fi fi |