From cff315e9c6a2b19c28fa3d237eadbdd10e8eae77 Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Mon, 17 Jun 2019 12:24:41 -0700 Subject: [PATCH] Update image types to match current offerings. (#548) * * updated image types to match current offerings * fixed broken link in ister.rst - now pointing at image-types.rst Signed-off-by: Kevin Putnam * Updates based on peer review. Signed-off-by: Kevin Putnam * Removed deprecated cloud image. Signed-off-by: Kevin Putnam --- source/clear-linux/guides/tooling/ister.rst | 5 ++- source/clear-linux/reference/image-types.rst | 37 ++++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/source/clear-linux/guides/tooling/ister.rst b/source/clear-linux/guides/tooling/ister.rst index 4f29229a..be2df62b 100644 --- a/source/clear-linux/guides/tooling/ister.rst +++ b/source/clear-linux/guides/tooling/ister.rst @@ -16,8 +16,8 @@ Description |CL| is a rolling release and produces on average 10 releases per week using the ister tool. With each release we produce multiple -`image types for different environments`_ and use cases such as installers, -Hyper-V, KVM, or VMWare. +:ref:`image types for different environments ` and use cases such +as installers, Hyper-V, KVM, or VMWare. Each image has a JSON configuration file used by ister to generate the image. These JSON configuration files describe the image type, partitions, version, @@ -88,7 +88,6 @@ Related topics * :ref:`bulk-provision` .. _ister.py tool: https://github.com/bryteise/ister -.. _image types for different environments: https://cdn.download.clearlinux.org/image/README-IMAGES.html .. _Configuration files for the current release: https://cdn.download.clearlinux.org/current/config/image/ .. _Previous releases: https://cdn.download.clearlinux.org/releases/ .. _Install a bundle: https://clearlinux.org/documentation/clear-linux/guides/maintenance/swupd-guide#adding-a-bundle \ No newline at end of file diff --git a/source/clear-linux/reference/image-types.rst b/source/clear-linux/reference/image-types.rst index a87fbd56..7fac89f8 100644 --- a/source/clear-linux/reference/image-types.rst +++ b/source/clear-linux/reference/image-types.rst @@ -35,14 +35,11 @@ Table 2 lists the currently available images that are platform specific. * - Image Type - Description - * - installer.img - - Preferred image of |CL| with interactive installer. + * - live-desktop.img or live-desktop.iso + - Image for booting to GNOME\* desktop to preview or install the OS. - * - installer.iso - - ISO of |CL| with interactive installer. Only for special cases where ISO image format is required (not for use with a USB key) - - * - live.img - - Image for live booting into memory, without requiring installaton. + * - live-server.img or live-server.iso + - Image for booting to server command prompt to preview or install the OS. .. list-table:: Table 2: Types of platform-specific |CL| images :widths: 15, 85 @@ -51,21 +48,27 @@ Table 2 lists the currently available images that are platform specific. * - Image Type - Description + * - aws.img + - Image suitable for use with Amazon\* AWS\*. + * - azure.vhd - - Virtual Hard Disk for use on Microsoft\* Azure\* cloud platform + - Virtual Hard Disk for use on Microsoft\* Azure\* cloud platform. * - azure-docker.vhd - - Virtual Hard Disk for use on Microsoft Azure cloud platform with Docker\* pre-installed + - Virtual Hard Disk for use on Microsoft Azure cloud platform with Docker\* pre-installed. * - azure-machine-learning.vhd - - Virtual Hard Disk for use on Microsoft Azure cloud platform with the `machine-learning-basic` bundle installed + - Virtual Hard Disk for use on Microsoft Azure cloud platform with the `machine-learning-basic` bundle installed. - * - cloud.img - - Image for use by cloud deployments such as OpenStack\* + * - cloudguest.img + - Image with generic cloud guest virtual machine (VM) requirements installed. - * - containers.img + * - container-host-kvm.img - Image for use by Clear Containers runtime. Includes `optimized kernel`_ for Clear Containers. + * - gce.tar + - Image with the Google Compute Engine (GCE) specific kernel. + * - hyperv.vhdx - Virtual Hard Disk for use with Microsoft Hyper-V\* hypervisor. Includes `optimized kernel`_ for Hyper-V. @@ -73,9 +76,15 @@ Table 2 lists the currently available images that are platform specific. - Image for booting in a simple VM with start_qemu.sh. Includes `optimized kernel`_ for KVM. + * - kvm-legacy.img + - Image for booting in a simple VM using legacy BIOS, if using start_qemu.sh make sure to remove -bios parameter. + + * - pxe.tar + - Image suitable for use with PXE server. + * - vmware.vmdk - Virtual Machine Disk for VMware\* platforms inclduing Player, Workstation, and ESXi. -.. _images: https://cdn.download.clearlinux.org/image +.. _images: https://clearlinux.org/downloads .. _`optimized kernel`: https://clearlinux.org/documentation/clear-linux/reference/compatible-kernels