Skip to content

Commit 88b0815

Browse files
committed
cmd-build-with-buildah: selectively source NAME from argsfile
In [1] we added `DESCRIPTION=Fedora CoreOS testing-devel` to build-args.conf, but this isn't exactly proper bash syntax. Bash would want `Fedora CoreOS testing-devel` to be in quotes, but `podman`/`docker` don't really support that in env file [2] [3] and I assume args file is the same. If I added quotes there I get "org.opencontainers.image.description": "\"Fedora CoreOS branched\"". [1] coreos/fedora-coreos-config@90109c4 [2] containers/podman#9446 [3] docker/for-linux#1208
1 parent 9fa6fe0 commit 88b0815

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/cmd-build-with-buildah

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@ build_with_buildah() {
179179
set -- "$@" --layers=true
180180
# output to a tag since it's more convenient for development;
181181
# buildah doesn't support doing both at once
182-
# shellcheck disable=SC1090
183-
osname=$(source "src/config/${argsfile}"; echo "${NAME}")
182+
osname=$(eval "$(grep 'NAME=' "src/config/${argsfile}")"; echo "${NAME}")
184183
final_ref="containers-storage:localhost/${osname}:${VERSION}"
185184
else
186185
# In the supermin path ensure the ociarchive gets compressed

0 commit comments

Comments
 (0)