Browse Source

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 5 years ago
parent
commit
1f28a4d716
2 changed files with 1 additions and 2 deletions
  1. 0 1
      packaging/docker/README.md
  2. 1 1
      packaging/docker/run.sh

+ 0 - 1
packaging/docker/README.md

@@ -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

+ 1 - 1
packaging/docker/run.sh

@@ -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