diff options
| author | Joshua Watt <JPEWhacker@gmail.com> | 2023-10-16 15:08:32 -0600 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-11-06 16:21:12 +0000 |
| commit | e133bbf7bb71387763a7b0c2df9c25e12a9e05c0 (patch) | |
| tree | 9940d17437c4052edfc37d52fa0647db141604a1 /classes | |
| parent | d8a2857633ed3fc8c7589cf92ba1cf85fbaa4da0 (diff) | |
| download | meta-virtualization-e133bbf7bb71387763a7b0c2df9c25e12a9e05c0.tar.gz | |
classes/image-oci-umoci: Allow labels to have spaces
Quote the label argument passed to umoci to allow it to correctly handle
spaces. Note that this requires that OCI_IMAGE_LABELS have the argument
quoted with single quotes, as in:
OCI_IMAGE_LABELS = "org.opencontainers.image.description='${SUMMARY}'"
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image-oci-umoci.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc index 70254c41..9ece0404 100644 --- a/classes/image-oci-umoci.inc +++ b/classes/image-oci-umoci.inc | |||
| @@ -58,8 +58,8 @@ IMAGE_CMD:oci() { | |||
| 58 | bbdebug 1 "OCI: configuring image" | 58 | bbdebug 1 "OCI: configuring image" |
| 59 | if [ -n "${OCI_IMAGE_LABELS}" ]; then | 59 | if [ -n "${OCI_IMAGE_LABELS}" ]; then |
| 60 | for l in ${OCI_IMAGE_LABELS}; do | 60 | for l in ${OCI_IMAGE_LABELS}; do |
| 61 | bbdebug 1 "OCI: umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label $l" | 61 | bbdebug 1 "OCI: umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label \"$l\"" |
| 62 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label $l | 62 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label "$l" |
| 63 | done | 63 | done |
| 64 | fi | 64 | fi |
| 65 | if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then | 65 | if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then |