refactor: standardize redis module and improve workflow reliability

igorpecovnik · igorpecovnik · commit 96463d546f80 · 2026-01-26T01:29:14.000+01:00
- Refactor redis module to match uptime-kuma style
- Fix docker package check (docker-ce -&gt; docker.io)
- Improve container/image detection with --filter and --format flags
- Fix systemd readiness check in workflow (sleep -&gt; proper wait)
- Fix typos and bash syntax issues
diff --git a/.github/workflows/maintenance-unit-tests.yml b/.github/workflows/maintenance-unit-tests.yml
@@ -35,6 +35,7 @@ jobs:
         with:
           files: |
               tests/*.conf
+          separator: "\n"
 
       - name: "Make JSON ${{ steps.changed-files.outputs.all_changed_files }}"
         id: json
@@ -54,16 +55,17 @@ jobs:
           images=("bookworm" "trixie" "forky" "jammy" "noble" "resolute")
           # read tests cases
           if [[ -n "${{ steps.changed-files.outputs.all_changed_files }}" ]]; then
-              tests=($(grep -rwl ${{ steps.changed-files.outputs.all_changed_files }} -e "ENABLED=true" | cut -d":" -f1))
-              else
+              mapfile -t changed_files <<< "${{ steps.changed-files.outputs.all_changed_files }}"
+              tests=($(grep -rwl -e "ENABLED=true" -- "${changed_files[@]}" | cut -d":" -f1))
+           else
               tests=($(grep -rwl tests/*.conf -e "ENABLED=true" | cut -d":" -f1))
           fi
           # loop enabled test cases
           for i in "${tests[@]}"; do
              unset RELEASE
              source "${i}"
              if [[ -z "${RELEASE}" || "${RELEASE}" == "all" ]]; then RELEASE=all; fi
-             # if we speficy releases, we need to loop docker images and use if there is a match
+             # if we specify releases, we need to loop docker images and use if there is a match
              if [[ $RELEASE != "all" ]]; then
                 for j in ${images[@]}; do
                     elements=($(echo $RELEASE | tr ':' "\n"))
diff --git a/tests/cockpit.conf b/tests/cockpit.conf
@@ -1,4 +1,4 @@
-ENABLED=true
+ENABLED=false
 RELEASE="noble"
 TESTNAME="Cockpit install"
 
diff --git a/tests/homeassistant.conf b/tests/homeassistant.conf
@@ -1,10 +1,9 @@
-ENABLED=true
+ENABLED=false
 RELEASE="bookworm"
 TESTNAME="Home Assistant install"
 
 testcase() {(
-	set -e
-	./bin/armbian-config --api module_armbian_firmware repository rolling
+	./bin/armbian-config --api module_armbian_firmware repository stable
 	./bin/armbian-config --api module_haos install
 	./bin/armbian-config --api module_haos status
 )}
diff --git a/tools/modules/software/module_duplicati.sh b/tools/modules/software/module_duplicati.sh
@@ -1,5 +1,5 @@
 module_options+=(
-	["module_duplicati,author"]=""
+	["module_duplicati,author"]="@armbian"
 	["module_duplicati,maintainer"]="@igorpecovnik"
 	["module_duplicati,feature"]="module_duplicati"
 	["module_duplicati,example"]="install remove purge status help"
@@ -17,10 +17,9 @@ function module_duplicati () {
 	local title="duplicati"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/duplicati?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/duplicati?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=duplicati" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}} {{.ID}}' | grep 'duplicati' | awk '{print $2}')
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_duplicati,example"]}"
@@ -34,7 +33,6 @@ function module_duplicati () {
 			local DUPLICATI_ENCRYPTION_KEY="$1"
 			local DUPLICATI_WEBUI_PASSWORD="$2"
 
-			pkg_installed docker-ce || module_docker install
 			[[ -d "$DUPLICATI_BASE" ]] || mkdir -p "$DUPLICATI_BASE" || { echo "Couldn't create storage directory: $DUPLICATI_BASE"; exit 1; }
 
 			# If no encryption key provided, prompt for it
@@ -60,8 +58,9 @@ function module_duplicati () {
 			fi
 
 			docker run -d \
-			--name=duplicati \
 			--net=lsio \
+			--name duplicati \
+			--restart=always \
 			-e PUID=1000 \
 			-e PGID=1000 \
 			-e TZ="$(cat /etc/timezone)" \
@@ -71,30 +70,30 @@ function module_duplicati () {
 			-v "${DUPLICATI_BASE}/config:/config" \
 			-v "${DUPLICATI_BASE}/backups:/backups" \
 			-v /:/source:ro \
-			--restart unless-stopped \
 			lscr.io/linuxserver/duplicati:latest
 			for i in $(seq 1 20); do
-				if docker inspect -f '{{ index .Config.Labels "build_version" }}' duplicati >/dev/null 2>&1 ; then
-					break
-				else
-					sleep 3
+				state="$(docker inspect -f '{{.State.Status}}' duplicati 2>/dev/null || true)"
+				if [[ "$state" == "running" ]]; then
+				break
 				fi
-				if [ $i -eq 20 ]; then
-					echo -e "\nTimed out waiting for ${title} to start, consult your container logs for more info (\`docker logs duplicati\`)"
+				sleep 3
+				if [[ $i -eq 20 ]]; then
+					echo -e "\nTimed out waiting for ${title} to start, consult logs (\`docker logs duplicati\`)"
 					exit 1
 				fi
 			done
 		;;
 		"${commands[1]}")
-			if [[ -n "${container}" ]]; then
-				docker container rm -f "${container}" >/dev/null
-			fi
-
-			if [[ -n "${image}" ]]; then
-				docker image rm "${image}" >/dev/null
+			if [[ "${container}" ]]; then
+				echo "Removing container: $container"
+				docker container rm -f "$container"
 			fi
 		;;
 		"${commands[2]}")
+			${module_options["module_duplicati,feature"]} ${commands[1]}
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
 			${module_options["module_duplicati,feature"]} ${commands[1]}
 			if [[ -n "${DUPLICATI_BASE}" && "${DUPLICATI_BASE}" != "/" ]]; then
 				rm -rf "${DUPLICATI_BASE}"
diff --git a/tools/modules/software/module_haos.sh b/tools/modules/software/module_haos.sh
@@ -1,5 +1,5 @@
 module_options+=(
-	["module_haos,author"]="@igorpecovnik"
+	["module_haos,author"]="@armbian"
 	["module_haos,maintainer"]="@igorpecovnik"
 	["module_haos,feature"]="module_haos"
 	["module_haos,example"]="install remove purge status help"
@@ -18,10 +18,9 @@ function module_haos() {
 	local title="haos"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/home-assistant/{print $1}')
-		local image=$(docker image ls -a | mawk '/home-assistant/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=home-assistant" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}} {{.ID}}' | grep 'home-assistant' | awk '{print $2}')
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_haos,example"]}"
@@ -30,7 +29,6 @@ function module_haos() {
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
 			[[ -d "$HAOS_BASE" ]] || mkdir -p "$HAOS_BASE" || { echo "Couldn't create storage directory: $HAOS_BASE"; exit 1; }
 
 			# this hack will allow running it on minimal image, but this has to be done properly in the network section, to allow easy switching
@@ -133,13 +131,15 @@ function module_haos() {
 			srv_disable supervisor-fix
 			srv_stop supervisor-fix
 			pkg_remove homeassistant-supervised os-agent
-			echo -e "Removing Home Assistant containers.\n\nPlease wait few minutes! "
+			echo "Removing Home Assistant containers."
+			echo "Please wait, this may take a few minutes..."
 			if [[ "${container}" ]]; then
-				echo "${container}" | xargs docker stop >/dev/null 2>&1
-				echo "${container}" | xargs docker rm >/dev/null 2>&1
+				echo "Removing containers: $container"
+				echo "${container}" | xargs docker stop 2>&1
+				echo "${container}" | xargs docker container rm 2>&1
 			fi
 			if [[ "${image}" ]]; then
-				echo "${image}" | xargs docker image rm >/dev/null 2>&1
+				echo "${image}" | xargs docker image rm 2>&1
 			fi
 			rm -f /usr/local/bin/supervisor_fix.sh
 			rm -f /etc/systemd/system/supervisor-fix.service
diff --git a/tools/modules/software/module_navidrome.sh b/tools/modules/software/module_navidrome.sh
@@ -17,10 +17,9 @@ function module_navidrome () {
 	local title="navidrome"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/navidrome?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/navidrome?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=navidrome" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}} {{.ID}}' | grep 'navidrome' | awk '{print $2}')
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_navidrome,example"]}"
@@ -29,38 +28,45 @@ function module_navidrome () {
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
 			[[ -d "$NAVIDROME_BASE" ]] || mkdir -p "$NAVIDROME_BASE"/{music,data} || { echo "Couldn't create storage directory: $NAVIDROME_BASE"; exit 1; }
 			sudo chown -R 1000:1000 "$NAVIDROME_BASE"/
 			docker run -d \
-			--name=navidrome \
 			--net=lsio \
+			--name navidrome \
+			--restart=always \
 			--user 1000:1000 \
 			-e TZ="$(cat /etc/timezone)" \
 			-p 4533:4533 \
 			-v "${NAVIDROME_BASE}/music:/music" \
 			-v "${NAVIDROME_BASE}/data:/data" \
-			--restart unless-stopped \
 			deluan/navidrome:latest
 			for i in $(seq 1 20); do
-				if docker inspect -f '{{ index .Config.Labels "build_version" }}' navidrome >/dev/null 2>&1 ; then
-					break
-				else
-					sleep 3
+				state="$(docker inspect -f '{{.State.Status}}' navidrome 2>/dev/null || true)"
+				if [[ "$state" == "running" ]]; then
+				break
 				fi
-				if [ $i -eq 20 ] ; then
-					echo -e "\nTimed out waiting for ${title} to start, consult your container logs for more info (\`docker logs navidrome\`)"
+				sleep 3
+				if [[ $i -eq 20 ]]; then
+					echo -e "\nTimed out waiting for ${title} to start, consult logs (\`docker logs navidrome\`)"
 					exit 1
 				fi
 			done
 		;;
 		"${commands[1]}")
-			if [[ "${container}" ]]; then docker container rm -f "$container" >/dev/null; fi
-			if [[ "${image}" ]]; then docker image rm "$image" >/dev/null; fi
+			if [[ "${container}" ]]; then
+				echo "Removing container: $container"
+				docker container rm -f "$container"
+			fi
 		;;
 		"${commands[2]}")
 			${module_options["module_navidrome,feature"]} ${commands[1]}
-			if [[ -n "${NAVIDROME_BASE}" && "${NAVIDROME_BASE}" != "/" ]]; then rm -rf "${NAVIDROME_BASE}"; fi
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
+			${module_options["module_navidrome,feature"]} ${commands[1]}
+			if [[ -n "${NAVIDROME_BASE}" && "${NAVIDROME_BASE}" != "/" ]]; then
+				rm -rf "${NAVIDROME_BASE}"
+			fi
 		;;
 		"${commands[3]}")
 			if [[ "${container}" && "${image}" ]]; then
diff --git a/tools/modules/software/module_portainer.sh b/tools/modules/software/module_portainer.sh
@@ -17,10 +17,9 @@ module_portainer() {
 	local title="portainer"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=portainer" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}} {{.ID}}' | grep 'portainer/portainer' | awk '{print $2}')
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_portainer,example"]}"
@@ -29,40 +28,41 @@ module_portainer() {
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
 			[[ -d "$PORTAINER_BASE" ]] || mkdir -p "$PORTAINER_BASE" || { echo "Couldn't create storage directory: $PORTAINER_BASE"; exit 1; }
 			docker volume ls -q | grep -xq 'portainer_data' || docker volume create portainer_data
 			docker run -d \
-			--name=portainer \
+			--name portainer \
+			--restart=always \
 			-p '9000:9000' \
 			-p '8000:8000' \
 			-p '9443:9443' \
 			-v '/run/docker.sock:/var/run/docker.sock' \
 			-v "${PORTAINER_BASE}/data:/data" \
-			--restart=always \
 			portainer/portainer-ce
 			#-v '/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro' \
 			for i in $(seq 1 20); do
-				if docker inspect -f '{{ index .Config.Labels "build_version" }}' portainer >/dev/null 2>&1 ; then
-					break
-				else
-					sleep 3
+				state="$(docker inspect -f '{{.State.Status}}' portainer 2>/dev/null || true)"
+				if [[ "$state" == "running" ]]; then
+				break
 				fi
-				if [ $i -eq 20 ] ; then
-					echo -e "\nTimed out waiting for ${title} to start, consult your container logs for more info (\`docker logs portainer\`)"
+				sleep 3
+				if [[ $i -eq 20 ]]; then
+					echo -e "\nTimed out waiting for ${title} to start, consult logs (\`docker logs portainer\`)"
 					exit 1
 				fi
 			done
 		;;
 		"${commands[1]}")
 			if [[ "${container}" ]]; then
-				docker container rm -f "$container" >/dev/null
-			fi
-			if [[ "${image}" ]]; then
-				docker image rm "$image" >/dev/null
+				echo "Removing container: $container"
+				docker container rm -f "$container"
 			fi
 		;;
 		"${commands[2]}")
+			${module_options["module_portainer,feature"]} ${commands[1]}
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
 			${module_options["module_portainer,feature"]} ${commands[1]}
 			if [[ -n "${PORTAINER_BASE}" && "${PORTAINER_BASE}" != "/" ]]; then
 				rm -rf "${PORTAINER_BASE}"
diff --git a/tools/modules/software/module_postgres.sh b/tools/modules/software/module_postgres.sh
diff --git a/tools/modules/software/module_redis.sh b/tools/modules/software/module_redis.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ENABLED=true`
	`1`	`+ENABLED=false`
`2`	`2`	`RELEASE="noble"`
`3`	`3`	`TESTNAME="Cockpit install"`
`4`	`4`