mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
16c89216dc
The original tar output of the oci image followed the sloci-image
convention of putting the oci contents into a subdirectory in the
tarball. This allows it to work directly with skopeo, etc, but it
isn't the format that tools like podman expect in an oci-image
tarball.
We move the original format to have "-dir" in the name, and let
the more simply named one be the oci-image format as expcted by
various 3rd party tools
1) image_name.tar: compatible with oci tar format, blobs and
rootfs are at the top level. Can load directly from something like podman
2) image_name-dir.tar: original format from meta-virt, is just a
tar'd up oci image directory (compatible with skopeo :dir format)
We also fix a bug in the sloci-image backend, where the sloci tar
was removing the raw oci image directory leaving a dangling symlink.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
90 lines
3.5 KiB
PHP
90 lines
3.5 KiB
PHP
IMAGE_CMD:oci() {
|
|
sloci_options=""
|
|
|
|
bbdebug 1 "OCI image settings:"
|
|
bbdebug 1 " author: ${OCI_IMAGE_AUTHOR}"
|
|
bbdebug 1 " author email: ${OCI_IMAGE_AUTHOR_EMAIL}"
|
|
bbdebug 1 " tag: ${OCI_IMAGE_TAG}"
|
|
bbdebug 1 " arch: ${OCI_IMAGE_ARCH}"
|
|
bbdebug 1 " subarch: ${OCI_IMAGE_SUBARCH}"
|
|
bbdebug 1 " entrypoint: ${OCI_IMAGE_ENTRYPOINT}"
|
|
bbdebug 1 " entrypoing args: ${OCI_IMAGE_ENTRYPOINT_ARGS}"
|
|
bbdebug 1 " labels: ${OCI_IMAGE_LABELS}"
|
|
bbdebug 1 " uid: ${OCI_IMAGE_RUNTIME_UID}"
|
|
bbdebug 1 " working dir: ${OCI_IMAGE_WORKINGDIR}"
|
|
bbdebug 1 " env vars: ${OCI_IMAGE_ENV_VARS}"
|
|
bbdebug 1 " ports: ${OCI_IMAGE_PORTS}"
|
|
|
|
# Change into the image deploy dir to avoid having any output operations capture
|
|
# long directories or the location.
|
|
cd ${IMGDEPLOYDIR}
|
|
|
|
oci_image_label_options=""
|
|
if [ -n "${OCI_IMAGE_LABELS}" ]; then
|
|
for l in ${OCI_IMAGE_LABELS}; do
|
|
oci_image_label_options="${oci_image_label_options} --label ${l}"
|
|
done
|
|
fi
|
|
oci_image_env_options=""
|
|
if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then
|
|
for l in ${OCI_IMAGE_ENV_VARS}; do
|
|
oci_image_env_options="${oci_image_env_options} --env ${l}"
|
|
done
|
|
fi
|
|
oci_image_port_options=""
|
|
if [ -n "${OCI_IMAGE_PORTS}" ]; then
|
|
for l in ${OCI_IMAGE_PORTS}; do
|
|
oci_image_port_options="${oci_image_port_options} --port ${l}"
|
|
done
|
|
fi
|
|
|
|
if [ -n "${OCI_IMAGE_RUNTIME_UID}" ]; then
|
|
oci_image_user_options="--user ${OCI_IMAGE_RUNTIME_UID}"
|
|
fi
|
|
|
|
if [ -n "${OCI_IMAGE_WORKINGDIR}" ]; then
|
|
oci_image_working_dir_options="--working-dir ${OCI_IMAGE_WORKINGDIR}"
|
|
fi
|
|
|
|
if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then
|
|
sloci_options="$sloci_options --tar"
|
|
fi
|
|
|
|
# options that always appear are required for a valid oci container image
|
|
# others are optional based on settings.
|
|
sloci-image $sloci_options \
|
|
--arch ${OCI_IMAGE_ARCH} \
|
|
--arch-variant "${OCI_IMAGE_SUBARCH}" \
|
|
--entrypoint ${OCI_IMAGE_ENTRYPOINT} \
|
|
--cmd "${OCI_IMAGE_ENTRYPOINT_ARGS}" \
|
|
--author ${OCI_IMAGE_AUTHOR_EMAIL} \
|
|
${oci_image_user_options} \
|
|
${oci_image_label_options} \
|
|
${oci_image_env_options} \
|
|
${oci_image_working_dir_options} \
|
|
${oci_image_port_options} \
|
|
${IMAGE_ROOTFS} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci:${OCI_IMAGE_TAG}
|
|
|
|
if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then
|
|
# if tar is specified, sloci-image is removing the directory that we need for a secondary
|
|
# tar format, so we need to restore it.
|
|
tar xf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar
|
|
fi
|
|
|
|
# create a convenience symlink
|
|
ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci ${IMAGE_BASENAME}-${OCI_IMAGE_TAG}-oci
|
|
|
|
if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then
|
|
# move the sloci output to a naming convention that matches what we do with umoci, thie
|
|
# default creates a subdirectory, so it get the "-dir" in the name
|
|
mv ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-dir.tar
|
|
ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-dir.tar ${IMAGE_BASENAME}-${OCI_IMAGE_TAG}-oci-dir.tar
|
|
|
|
(
|
|
cd "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci"
|
|
tar -cf ../"${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar" "."
|
|
)
|
|
ln -sf "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar" ${IMAGE_BASENAME}-${OCI_IMAGE_TAG}-oci.tar
|
|
fi
|
|
}
|