From: Matthias Beckert <
matthias...@elektrobit.com>
Without a PATH variable as part of the container config, certain
tools[1] used in Github Actions may break PATH.
[1]
https://github.com/actions/runner/issues/3210
Co-authored-by: Isaac True <
it...@emlix.com>
Signed-off-by: Isaac True <
it...@emlix.com>
---
meta/classes/imagetypes_container.bbclass | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/imagetypes_container.bbclass b/meta/classes/imagetypes_container.bbclass
index 60b65bd8..ea15decf 100644
--- a/meta/classes/imagetypes_container.bbclass
+++ b/meta/classes/imagetypes_container.bbclass
@@ -13,6 +13,7 @@ CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}"
CONTAINER_IMAGE_TAG ?= "${PV}-${PR}"
CONTAINER_IMAGE_CMD ?= "/bin/dash"
CONTAINER_IMAGE_ENTRYPOINT ?= ""
+CONTAINER_IMAGE_PATH ?= "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
python() {
if not bb.utils.to_boolean(d.getVar('USING_CONTAINER')):
@@ -30,6 +31,7 @@ do_containerize() {
local entrypoint="${CONTAINER_IMAGE_ENTRYPOINT}"
local empty_tag="empty"
local tag="${CONTAINER_IMAGE_TAG}"
+ local path="${CONTAINER_IMAGE_PATH}"
local oci_img_dir="${WORKDIR}/oci-image"
local rootfs="${IMAGE_ROOTFS}"
@@ -46,6 +48,10 @@ do_containerize() {
sudo umoci config --image "${oci_img_dir}:${empty_tag}" \
--config.entrypoint="${entrypoint}"
fi
+ if [ -n "${path}" ]; then
+ sudo umoci config --image "${oci_img_dir}:${empty_tag}" \
+ --config.env="PATH=${path}"
+ fi
sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \
"${oci_img_dir}_unpacked"