netdata/packaging/docker: Fix docker documentation and a fix to avoid failures (#6344)
* 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
Paul Emm. Katsoulakis committed
Jun 25, 2019 at 20:43 UTC
1f28a4d716f14dad03deb26c06f9eeec7ecd22ff
2 files changed
+1
-2
packaging/docker/README.md
-1
@@ -50,7 +50,6 @@ services:
50
- /proc:/host/proc:ro
51
- /sys:/host/sys:ro
52
- /var/run/docker.sock:/var/run/docker.sock:ro
53
- - /path/to/actual/docker/on/the/host:/usr/bin/docker
53
```
54
55
### Docker container names resolution
packaging/docker/run.sh
+1
-1
@@ -42,7 +42,7 @@ if [ -S "${DOCKER_SOCKET}" ] && [ -n "${PGID}" ]; then
42
GRP=$(create_group_and_assign_to_user "${DOCKER_GROUP}" "${PGID}" "${DOCKER_USR}")
43
if [ -n "${GRP}" ]; then
44
echo "Adjusting ownership of mapped docker socket '${DOCKER_SOCKET}' to root:${GRP}"
45
- chown "root:${GRP}" "${DOCKER_SOCKET}"
45
+ chown "root:${GRP}" "${DOCKER_SOCKET}" || echo "Failed to change ownership on docker socket, container name resolution might not work"
46
fi
47
fi
48