diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-08-10 09:18:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-08-10 09:19:08 +0000 |
| commit | a2d7dede737947d7c6afa20a88e1f0c64e0eb96c (patch) | |
| tree | fed4aff7dbe0be00cf91de6261d98bc0eb9a2449 /packaging/docker | |
| parent | Releasing debian version 1.41.0-1. (diff) | |
| download | netdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.tar.xz netdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.zip | |
Merging upstream version 1.42.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/docker')
| -rwxr-xr-x | packaging/docker/run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh index ed77c394a..eede14e38 100755 --- a/packaging/docker/run.sh +++ b/packaging/docker/run.sh @@ -46,9 +46,10 @@ if [ -n "${PGID}" ]; then usermod -a -G "${PGID}" "${DOCKER_USR}" || echo >&2 "Could not add netdata user to group docker with ID ${PGID}" fi -if mountpoint -q /etc/netdata && [ -z "$(ls -A /etc/netdata)" ]; then +if mountpoint -q /etc/netdata; then echo "Copying stock configuration to /etc/netdata" - cp -a /etc/netdata.stock/. /etc/netdata + cp -an /etc/netdata.stock/* /etc/netdata + cp -an /etc/netdata.stock/.[^.]* /etc/netdata fi if [ -w "/etc/netdata" ]; then |