Merge pull request #7590 from tianon/cirros

Update CirrOS to 0.5.1

library/cirros

@@ -3,7 +3,7 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon)
 GitRepo: https://github.com/tianon/docker-brew-cirros.git
 GitFetch: refs/heads/dist
-GitCommit: b023599351e958911d5c61f3e2caeea2eb71d928
+GitCommit: 0f4ac5ae1e2b7bbff60b81b554f7578be1caec3b
 Architectures: amd64, arm32v5, arm64v8, i386, ppc64le
 amd64-Directory: arches/amd64
 arm32v5-Directory: arches/arm32v5
@@ -11,4 +11,4 @@ arm64v8-Directory: arches/arm64v8
 i386-Directory: arches/i386
 ppc64le-Directory: arches/ppc64le
 
-Tags: 0.5.0, 0.5, 0, latest
+Tags: 0.5.1, 0.5, 0, latest

test/tests/no-hard-coded-passwords/run.sh

@@ -52,6 +52,12 @@ for user in "${!passwds[@]}"; do
 
 	if [ "${pass:0:1}" = '$' ]; then
 		# gotta be crypt ($id$salt$encrypted), must be a fail
+		if [[ "$1" == cirros* ]] && [ "$user" = 'cirros' ]; then
+			# cirros is "supposed" to have a password for the cirros user
+			# https://github.com/cirros-dev/cirros/tree/68771c7620ec100db4afb75dc4c145f4e49fe7fc#readme
+			echo >&2 "warning: CirrOS has a password for the 'cirros' user (as intended)"
+			continue
+		fi
 		echo >&2 "error: crypt password detected for '$user': '$pass'"
 		ret=1
 		continue