From e545862043ed96ff60de2a2eecc0f2654a03c426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83rcziem=20=E2=84=A2?= <118485377+spalencsar@users.noreply.github.com> Date: Fri, 3 Oct 2025 12:25:25 +0200 Subject: [PATCH] feat(users): offer docker-group addition when creating admin user interactively --- lib/common.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/common.sh b/lib/common.sh index 4fc6dbb..f0f746e 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -349,12 +349,27 @@ ensure_user_exists_interactive() { # Add to sudo group sudo usermod -aG sudo "$user" || true + # Optionally add to docker group if requested or if Docker is to be installed + local add_docker_default="n" + if [[ "${INSTALL_DOCKER:-false}" == "true" ]]; then + add_docker_default="y" + fi + + if ask_yes_no "Add user '$user' to 'docker' group?" "$add_docker_default"; then + sudo usermod -aG docker "$user" || true + # add rollback action for docker group removal + if declare -F add_rollback_action >/dev/null 2>&1; then + add_rollback_action "sudo gpasswd -d $user docker || true" + fi + log_info "User '$user' added to docker group" + fi + # Ask for password local pw pw=$(ask_password "Set password for user $user") echo "$user:$pw" | sudo chpasswd - # Record rollback action + # Record rollback action for user deletion if declare -F add_rollback_action >/dev/null 2>&1; then add_rollback_action "sudo userdel -r $user || true" fi