0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-26 13:54:48 +00:00

netdata/packaging/docker: Fix docker documentation and a fix to avoid failures ()

* netdata/packaging/docker: Remove docker binary reference

* netdata/packaging/docker: Make possible chown failure a soft error for the start up, we may not need it at all times.

This is a temporary fix, to avoid problems with read-only socket scenarios, until we finalize the design we will follow for the container name resolution
This commit is contained in:
Paul Emm. Katsoulakis 2019-06-25 20:43:10 +02:00 committed by GitHub
parent d1866e2f7d
commit 1f28a4d716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
packaging/docker

View file

@ -50,7 +50,6 @@ services:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
- /path/to/actual/docker/on/the/host:/usr/bin/docker
```
### Docker container names resolution

View file

@ -42,7 +42,7 @@ if [ -S "${DOCKER_SOCKET}" ] && [ -n "${PGID}" ]; then
GRP=$(create_group_and_assign_to_user "${DOCKER_GROUP}" "${PGID}" "${DOCKER_USR}")
if [ -n "${GRP}" ]; then
echo "Adjusting ownership of mapped docker socket '${DOCKER_SOCKET}' to root:${GRP}"
chown "root:${GRP}" "${DOCKER_SOCKET}"
chown "root:${GRP}" "${DOCKER_SOCKET}" || echo "Failed to change ownership on docker socket, container name resolution might not work"
fi
fi