diff options
author | Vasileios Anagnostopoulos <vasileios.anagnostopoulos@siemens.com> | 2022-07-12 14:26:46 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-15 17:14:57 -0400 |
commit | fb14913e224ba97786bc9b192a8b6d4a8d1592b9 (patch) | |
tree | ab7d86ddbab3684c1c096c9dea1b72686b5a5ea5 /classes | |
parent | 064a96fe1b3618370408c7a784abf035f0d56934 (diff) | |
download | meta-virtualization-fb14913e224ba97786bc9b192a8b6d4a8d1592b9.tar.gz |
image-oci-umoci: add parameter for stop signal
Add an optional parameter that allows to override the stop
signal that is used.
Signed-off-by: Vasileios Anagnostopoulos <vasileios.anagnostopoulos@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image-oci-umoci.inc | 4 | ||||
-rw-r--r-- | classes/image-oci.bbclass | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc index b159614f..f9417952 100644 --- a/classes/image-oci-umoci.inc +++ b/classes/image-oci-umoci.inc | |||
@@ -82,6 +82,10 @@ IMAGE_CMD:oci() { | |||
82 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR}" | 82 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR}" |
83 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR} | 83 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR} |
84 | fi | 84 | fi |
85 | if [ -n "${OCI_IMAGE_STOPSIGNAL}" ]; then | ||
86 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.stopsignal ${OCI_IMAGE_STOPSIGNAL}" | ||
87 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.stopsignal ${OCI_IMAGE_STOPSIGNAL} | ||
88 | fi | ||
85 | if [ -n "${OCI_IMAGE_OS}" ]; then | 89 | if [ -n "${OCI_IMAGE_OS}" ]; then |
86 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS}" | 90 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS}" |
87 | umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS} | 91 | umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS} |
diff --git a/classes/image-oci.bbclass b/classes/image-oci.bbclass index 7a39d27a..9ddb88b6 100644 --- a/classes/image-oci.bbclass +++ b/classes/image-oci.bbclass | |||
@@ -58,6 +58,7 @@ OCI_IMAGE_SUBARCH ?= "${@oci_map_subarch(d.getVar('TARGET_ARCH'), d.getVar('TUNE | |||
58 | OCI_IMAGE_ENTRYPOINT ?= "sh" | 58 | OCI_IMAGE_ENTRYPOINT ?= "sh" |
59 | OCI_IMAGE_ENTRYPOINT_ARGS ?= "" | 59 | OCI_IMAGE_ENTRYPOINT_ARGS ?= "" |
60 | OCI_IMAGE_WORKINGDIR ?= "" | 60 | OCI_IMAGE_WORKINGDIR ?= "" |
61 | OCI_IMAGE_STOPSIGNAL ?= "" | ||
61 | 62 | ||
62 | # List of ports to expose from a container running this image: | 63 | # List of ports to expose from a container running this image: |
63 | # PORT[/PROT] | 64 | # PORT[/PROT] |