diff options
Diffstat (limited to 'classes/image-oci-sloci-image.inc')
-rw-r--r-- | classes/image-oci-sloci-image.inc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/classes/image-oci-sloci-image.inc b/classes/image-oci-sloci-image.inc index 379f6fe0..9248489f 100644 --- a/classes/image-oci-sloci-image.inc +++ b/classes/image-oci-sloci-image.inc | |||
@@ -65,10 +65,25 @@ IMAGE_CMD:oci() { | |||
65 | ${oci_image_port_options} \ | 65 | ${oci_image_port_options} \ |
66 | ${IMAGE_ROOTFS} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci:${OCI_IMAGE_TAG} | 66 | ${IMAGE_ROOTFS} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci:${OCI_IMAGE_TAG} |
67 | 67 | ||
68 | if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then | ||
69 | # if tar is specified, sloci-image is removing the directory that we need for a secondary | ||
70 | # tar format, so we need to restore it. | ||
71 | tar xf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar | ||
72 | fi | ||
73 | |||
68 | # create a convenience symlink | 74 | # create a convenience symlink |
69 | ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci ${IMAGE_BASENAME}-${OCI_IMAGE_TAG}-oci | 75 | ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci ${IMAGE_BASENAME}-${OCI_IMAGE_TAG}-oci |
70 | 76 | ||
71 | if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then | 77 | if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then |
72 | 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 | 78 | # move the sloci output to a naming convention that matches what we do with umoci, thie |
79 | # default creates a subdirectory, so it get the "-dir" in the name | ||
80 | 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 | ||
81 | 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 | ||
82 | |||
83 | ( | ||
84 | cd "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci" | ||
85 | tar -cf ../"${IMAGE_NAME}${IMAGE_NAME_SUFFIX}-oci-${OCI_IMAGE_TAG}-${OCI_IMAGE_ARCH}-linux.oci-image.tar" "." | ||
86 | ) | ||
87 | 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 | ||
73 | fi | 88 | fi |
74 | } | 89 | } |