Merge branch 'main' into 324-bug-sanitize_input-does-not-work-as-expe…

…cted
armbian · Jan 10, 2025 · de72e38 · de72e38
2 parents 2836248 + 343887d
commit de72e38
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1 deletion.
diff --git a/tools/include/images/HA003.png → tools/include/images/HAS001.png b/tools/include/images/HA003.png → tools/include/images/HAS001.png
diff --git a/tools/include/markdown/HA003-footer.md → tools/include/markdown/HAS001-footer.md b/tools/include/markdown/HA003-footer.md → tools/include/markdown/HAS001-footer.md
diff --git a/tools/include/markdown/HA003-header.md → tools/include/markdown/HAS001-header.md b/tools/include/markdown/HA003-header.md → tools/include/markdown/HAS001-header.md
diff --git a/tools/modules/software/module_docker.sh b/tools/modules/software/module_docker.sh
@@ -44,7 +44,7 @@ function module_docker() {
 					fi
 
 					groupadd docker 2>/dev/null || true
-					usermod -aG docker $SUDO_USER
+					[[ -n "${SUDO_USER}" ]] && usermod -aG docker "${SUDO_USER}"
 					systemctl enable docker.service > /dev/null 2>&1
 					systemctl enable containerd.service > /dev/null 2>&1
 					systemctl start docker.service > /dev/null 2>&1

diff --git a/tools/modules/system/module_sshserver.sh b/tools/modules/system/module_sshserver.sh
@@ -62,6 +62,8 @@ function module_openssh-server () {
 					exit 1
 				fi
 			done
+			# install rsync
+			docker exec -it openssh-server /bin/bash -c "apk update; apk add rsync"
 		;;
 		"${commands[1]}")
 			[[ "${container}" ]] && docker container rm -f "$container" >/dev/null