Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 8 insertions, 29 deletions

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index b12af313d..bbc223a20 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # This image contains preinstalled dependencies
 # hadolint ignore=DL3007
-FROM netdata/builder:v2 as builder
+FROM netdata/builder:v2 AS builder
 
 # One of 'nightly' or 'stable'
 ARG RELEASE_CHANNEL=nightly
@@ -47,7 +47,6 @@ RUN mkdir -p /app/usr/sbin/ \
     mv /var/lib/netdata     /app/var/lib/ && \
     mv /etc/netdata         /app/etc/ && \
     mv /usr/sbin/netdata    /app/usr/sbin/ && \
-    mv /usr/sbin/netdata-claim.sh    /app/usr/sbin/ && \
     mv /usr/sbin/netdatacli    /app/usr/sbin/ && \
     mv /usr/sbin/systemd-cat-native /app/usr/sbin/ && \
     mv packaging/docker/run.sh        /app/usr/sbin/ && \
@@ -60,7 +59,7 @@ RUN mkdir -p /app/usr/sbin/ \
 #####################################################################
 # This image contains preinstalled dependencies
 # hadolint ignore=DL3007
-FROM netdata/base:v2 as base
+FROM netdata/base:v2 AS base
 
 LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
 LABEL org.opencontainers.image.url="https://netdata.cloud"
@@ -77,11 +76,11 @@ ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false
 
 ARG NETDATA_UID=201
 ARG NETDATA_GID=201
-ENV DOCKER_GRP netdata
-ENV DOCKER_USR netdata
+ENV DOCKER_GRP=netdata
+ENV DOCKER_USR=netdata
 # If DISABLE_TELEMETRY is set, it will disable anonymous stats collection and reporting
 #ENV DISABLE_TELEMETRY=1
-ENV NETDATA_LISTENER_PORT 19999
+ENV NETDATA_LISTENER_PORT=19999
 EXPOSE $NETDATA_LISTENER_PORT
 
 ENV NETDATA_EXTRA_DEB_PACKAGES=""
diff --git a/packaging/docker/README.md b/packaging/docker/README.md
index 6deb0cfa9..0f9ad23d6 100644
--- a/packaging/docker/README.md
+++ b/packaging/docker/README.md
@@ -1,12 +1,3 @@
-<!--
-title: "Install Netdata with Docker"
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/packaging/docker/README.md"
-sidebar_label: "Docker"
-learn_status: "Published"
-learn_rel_path: "Installation/Installation methods"
-sidebar_position: 40
--->
-
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
@@ -34,7 +25,7 @@ along with their descriptions.
 <details open>
 <summary>Privileges</summary>
 
-|       Component       |          Privileges           | Description                                                                                                              | 
+|       Component       |          Privileges           | Description                                                                                                              |
 |:---------------------:|:-----------------------------:|--------------------------------------------------------------------------------------------------------------------------|
 |    cgroups.plugin     |   host PID mode, SYS_ADMIN    | Container network interfaces monitoring. Map virtual interfaces in the system namespace to interfaces inside containers. |
 |      proc.plugin      |       host network mode       | Host system networking stack monitoring.                                                                                 |
@@ -47,7 +38,7 @@ along with their descriptions.
 <details open>
 <summary>Mounts</summary>
 
-|       Component        |           Mounts           | Description                                                                                                                                | 
+|       Component        |           Mounts           | Description                                                                                                                                |
 |:----------------------:|:--------------------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
 |        netdata         |      /etc/os-release       | Host info detection.                                                                                                                       |
 |    diskspace.plugin    |             /              | Host mount points monitoring.                                                                                                              |
@@ -177,14 +168,12 @@ Add `- /run/dbus:/run/dbus:ro` to the netdata service `volumes`.
 
 ### With NVIDIA GPUs monitoring
 
-
 Monitoring NVIDIA GPUs requires:
 
 - Using official [NVIDIA driver](https://www.nvidia.com/Download/index.aspx).
 - Installing [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html).
 - Allowing the Netdata container to access GPU resources.
 
-
 <Tabs>
 <TabItem value="docker_run" label="docker run">
 
@@ -366,6 +355,7 @@ services:
 volumes:
   caddy_data:
   caddy_config:
+  netdataconfig:
   netdatalib:
   netdatacache:
 ```
diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh
index 6ba16d1ce..56a818d2f 100755
--- a/packaging/docker/run.sh
+++ b/packaging/docker/run.sh
@@ -110,14 +110,4 @@ if [ -w "/etc/netdata" ]; then
   fi
 fi
 
-if [ -n "${NETDATA_CLAIM_URL}" ] && [ -n "${NETDATA_CLAIM_TOKEN}" ] && [ ! -f /var/lib/netdata/cloud.d/claimed_id ]; then
-  # shellcheck disable=SC2086
-  /usr/sbin/netdata-claim.sh -token="${NETDATA_CLAIM_TOKEN}" \
-                             -url="${NETDATA_CLAIM_URL}" \
-                             ${NETDATA_CLAIM_ROOMS:+-rooms="${NETDATA_CLAIM_ROOMS}"} \
-                             ${NETDATA_CLAIM_PROXY:+-proxy="${NETDATA_CLAIM_PROXY}"} \
-                             ${NETDATA_EXTRA_CLAIM_OPTS} \
-                             -daemon-not-running
-fi
-
 exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" "$@"