a little better

Signed-off-by: Jay R. Wren <[email protected]>

Dockerfile.template

@@ -32,8 +32,6 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 # add tzdata explicitly for https://github.com/docker-library/valkey/issues/138 (see also https://bugs.debian.org/837060 and related)
 		tzdata \
-# add util-linux for setpriv for step down from root.
-		util-linux \
 	; \
 	rm -rf /var/lib/apt/lists/*
 {{ ) end -}}

docker-entrypoint.sh

@@ -10,8 +10,7 @@ fi
 # allow the container to be started with `--user`
 if [ "$1" = 'valkey-server' -a "$(id -u)" = '0' ]; then
 	find . \! -user valkey -exec chown valkey '{}' +
-	# on alpine, setpriv is a busybox built-in, so use /usr/bin/setpriv
-	exec /usr/bin/setpriv --reuid=valkey "$0" "$@"
+	exec setpriv --reuid=valkey --regid=valkey --clear-groups -- "$0" "$@"
 fi
 
 # set an appropriate umask (if one isn't set already)

generate-stackbrew-library.sh

@@ -108,22 +108,10 @@ for version; do
 		suiteAliases=( "${suiteAliases[@]//latest-/}" )
 		variantAliases+=( "${suiteAliases[@]}" )
 
-		# calculate the intersection of parent image arches
-		arches="$(jq -r --arg arches "$arches" '
-			(
-				$arches
-				| gsub("^[[:space:]]+|[[:space:]]+$"; "")
-				| split("[[:space:]]+"; "")
-			) as $parentArches
-			| .[env.version]
-			| $parentArches
-			| join(", ")
-		' versions.json)"
-
 		echo
 		cat <<-EOE
 			Tags: $(join ', ' "${variantAliases[@]}")
-			Architectures: $arches
+			Architectures: $(join ', ' $arches)
 			GitCommit: $commit
 			Directory: $dir
 		EOE