From 1766609b0456bb972be496cb7270cc19dbbd69e3 Mon Sep 17 00:00:00 2001 From: Ryan Dale Date: Mon, 5 Feb 2024 09:15:13 -0500 Subject: [PATCH] bump --- .github/workflows/generic_build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generic_build.yml b/.github/workflows/generic_build.yml index 55da99a4..957a558e 100644 --- a/.github/workflows/generic_build.yml +++ b/.github/workflows/generic_build.yml @@ -152,7 +152,7 @@ jobs: LABELS=() LABELS+=("--label=deb-list=\"$( run cat /.deb.lst | tr '\n' '|' | sed 's/|$//' )\"") LABELS+=("--label=pkg-list=\"$( run cat /.pkg.lst | tr '\n' '|' | sed 's/|$//' )\"") - # LABELS+=("--labels=glibc=\"$( run sh -c 'exec "$( find -xdev -name libc.so.6 -print -quit )"' | sed '1!d' )\"") + LABELS+=("--labels=glibc=\"$( run sh -c 'exec "$( find -xdev -name libc.so.6 -print -quit )"' | sed '1!d' )\"") LABELS+=("--label=debian=\"$( run cat /etc/debian_version | sed '1!d' )\"") LABELS+=("--label=bash=\"$( run bash --version | sed '1!d' )\"") @@ -171,7 +171,10 @@ jobs: # Add labels to a new container... container="$( buildah from "${image_id}" )" - buildah config ${LABELS[@]} "${container}" + + # FIXME: can't quite get the quoting right for args in array, so + # disabling for now to get other things working. + # buildah config ${LABELS[@]} "${container}" # ...then store the container (now with labels) as a new image. This # is what we'll use to upload.