From 54e4e09d294fd0e6c20e7246c9c7f1dd7998ed87 Mon Sep 17 00:00:00 2001 From: "Josh.5" Date: Sun, 9 Oct 2022 12:30:57 +1300 Subject: [PATCH] Fix error where on a contrainer restart you could not add default user to docker gourp again --- overlay/etc/cont-init.d/80-configure-dind.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/overlay/etc/cont-init.d/80-configure-dind.sh b/overlay/etc/cont-init.d/80-configure-dind.sh index e5f2c1f..dc61eba 100644 --- a/overlay/etc/cont-init.d/80-configure-dind.sh +++ b/overlay/etc/cont-init.d/80-configure-dind.sh @@ -10,12 +10,14 @@ if ([ "${MODE}" != "s" ] && [ "${MODE}" != "secondary" ]); then echo "Docker socket has been passed in from host. Using that instead" fi # Configure 'default' user to run docker commands without sudo - echo "Add user '${USER}' to docker group for sudoless execution" - groupadd docker - usermod -aG docker ${USER} - mkdir -p /home/${USER}/.docker - chown -R ${PUID}:${PGID} /home/${USER}/.docker - chmod -R g+rwx /home/${USER}/.docker + if ! getent group docker &> /dev/null; then + echo "Add user '${USER}' to docker group for sudoless execution" + groupadd docker + usermod -aG docker ${USER} + mkdir -p /home/${USER}/.docker + chown -R ${PUID}:${PGID} /home/${USER}/.docker + chmod -R g+rwx /home/${USER}/.docker + fi else echo "Dockerd daemon not available when container is run in 'secondary' mode" fi