Merge pull request #1597 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed

Author: dcermak

kiwi-image/Dockerfile

@@ -18,8 +18,8 @@
 #!BuildTag: opensuse/bci/kiwi:10-%RELEASE%
 #!BuildTag: opensuse/bci/kiwi:10.1
 #!BuildTag: opensuse/bci/kiwi:10.1-%RELEASE%
-#!BuildTag: opensuse/bci/kiwi:10.1.2
-#!BuildTag: opensuse/bci/kiwi:10.1.2-%RELEASE%
+#!BuildTag: opensuse/bci/kiwi:10.1.4
+#!BuildTag: opensuse/bci/kiwi:10.1.4-%RELEASE%
 #!BuildTag: opensuse/bci/kiwi:latest
 
 FROM opensuse/tumbleweed:latest
@@ -31,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-r
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI KIWI Appliance Builder (kiwi)"
 LABEL org.opencontainers.image.description="KIWI Appliance Builder (kiwi) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported in privileged mode."
-LABEL org.opencontainers.image.version="10.1.2"
+LABEL org.opencontainers.image.version="10.1.4"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"

kiwi-image/kiwi-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  5 06:33:31 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Bump kiwi version
+
 -------------------------------------------------------------------
 Fri Aug 16 15:59:55 UTC 2024 - Dan Čermák <dcermak@suse.com>
 

mariadb-image/healthcheck.sh

@@ -66,25 +66,40 @@ connect()
 			return "$s";
 			;;
 	esac
-	# falling back to this if there wasn't a connection answer.
-	set +e +o pipefail
-	# (on second extra_file)
-	# shellcheck disable=SC2086
-	mariadb ${nodefaults:+--no-defaults} \
+	# falling back to tcp if there wasn't a connection answer.
+	s=$(mariadb ${nodefaults:+--no-defaults} \
 		${def['file']:+--defaults-file=${def['file']}} \
 		${def['extra_file']:+--defaults-extra-file=${def['extra_file']}}  \
 		${def['group_suffix']:+--defaults-group-suffix=${def['group_suffix']}}  \
 		--skip-ssl --skip-ssl-verify-server-cert \
-		-h localhost --protocol tcp -e 'select 1' 2>&1 \
-		| grep -qF "Can't connect"
-	local ret=${PIPESTATUS[1]}
-	set -eo pipefail
-	if (( "$ret" == 0 )); then
-		# grep Matched "Can't connect" so we fail
-		connect_s=1
-	else
-		connect_s=0
-	fi
+		-h localhost --protocol tcp \
+		--skip-column-names --batch --skip-print-query-on-error \
+		-e 'select @@skip_networking' 2>&1)
+
+	case "$s" in
+		1)      # skip-networking=1 (no network)
+			;&
+		ERROR\ 2002\ \(HY000\):*)
+			# cannot connect
+			connect_s=1
+			;;
+		0)      # skip-networking=0
+			;&
+		ERROR\ 1820\ \(HY000\)*) # password expire
+			;&
+		ERROR\ 4151\ \(HY000\):*) # account locked
+			;&
+		ERROR\ 1226\ \(42000\)*) # resource limit exceeded
+			;&
+		ERROR\ 1[0-9][0-9][0-9]\ \(28000\):*)
+			# grep access denied and other 28000 client errors - we did connect
+			connect_s=0
+			;;
+		*)
+			>&2 echo "Unknown error $s"
+			connect_s=1
+			;;
+	esac
 	return $connect_s
 }
 
@@ -367,8 +382,8 @@ while [ $# -gt 0 ]; do
 	fi
 	shift
 done
-if [ -z "$connect_s" ]; then
-	# we didn't do a connnect test, so the current success status is suspicious
+if [ "$connect_s" != "0" ]; then
+	# we didn't pass a connnect test, so the current success status is suspicious
 	# return what connect thinks.
 	connect
 	exit $?

mariadb-image/mariadb-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  4 11:25:11 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- update healtcheck.sh script from upstream
+
 -------------------------------------------------------------------
 Tue Sep  3 08:09:36 UTC 2024 - Dan Čermák <dcermak@suse.com>