Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- Fixed issues in Image Building chapter in the Administration Guide
(bsc#1245987)
- Changed prerequisite for proxy conversion in Installation and Upgrade
guide (bsc#1246158)
- Fixed persistent storage configuration details in Installation and Uprade
Expand Down
18 changes: 13 additions & 5 deletions modules/administration/pages/image-management.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Images are stored in [path]``/srv/www/os-image/ORGANIZATION-ID``.
[[at.images.docker]]
== Container Images

image::image-building.png[scaledwidth=80%]
// FIXME, bsc#1245987: replace caas pattform with container host?
// image::image-building.png[scaledwidth=80%]


[[at.images.docker.requirements]]
Expand Down Expand Up @@ -296,7 +297,7 @@ When you have selected a build profile, detailed information about the selected
[[at.images.docker.importing]]
=== Import an Image

The second way to build an image is to import and inspect arbitrary images.
The second way to get an image is to import and inspect arbitrary images.
To do that, select menu:Images[Image List] from the left navigation bar.
Complete the text boxes of the [guimenu]``Import`` dialog.
When it has processed, the imported image is listed on the [guimenu]``Image List`` page.
Expand Down Expand Up @@ -385,6 +386,10 @@ For more information, see the documentation of the underlying system.
[[at.images.kiwi.buildhost]]
=== Create a Build Host

// FIXME, bsc#1245987:
// Discussing Container-Based KIWI Image Build Support here?
// Perhaps 2.'docker' might be 2, but the container variant might be different?

To build all kinds of images with {productname}, create and configure a build host.
OS Image build hosts are {salt} clients running on {sles}{nbsp}15 (SP2 or later) or {sles}{nbsp}12 (SP4 or later).

Expand Down Expand Up @@ -476,7 +481,7 @@ Activation keys are mandatory for OS Image building.

[NOTE]
====
To build OS Images, you need an activation key that is associated with a channel other than `SUSE Manager Default`.
To build OS Images, you need an activation key that is associated with a channel other than `Default` activation key.
====

.Procedure: Creating an Activation Key
Expand All @@ -492,8 +497,11 @@ For more information, see xref:client-configuration:activation-keys.adoc[].
[[at.images.kiwi.imagestore]]
=== Create an Image Store

An image store is a place from where you can download images.
Sometimes such a place is referenced as a registry.

OS Images can require a significant amount of storage space.
Therefore, we recommended that the OS Image store is located on a partition of its own or on a Btrfs subvolume, separate from the root partition.
Therefore, we recommend that the OS Image store is located on a partition of its own or on a Btrfs subvolume, separate from the root partition.
By default, the image store is located at [path]``/srv/www/os-images``.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed.

Kiwi image store is hardcoded without option to change it. I think this snippet is from the time when we though about adding proper store, but this never materialized.

Also with containerization, this is completely obsoleted.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I removed l. 504. Or shall I remove more here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the line

By default, the image store is located at [path]/srv/www/os-images.

to

OS Image store is using srv-www volume.

That make sense coming together with the existing first line talking about storage space.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now I understand.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but there are more places, and not everything is clear...


[NOTE]
Expand Down Expand Up @@ -663,7 +671,7 @@ For information about the Kiwi build system, see the https://osinside.github.io/
[[at.images.kiwi.building]]
=== Build an Image

There are two ways to build an image using the {webui}.
There are two ways to build or get an image using the {webui}.
Either select menu:Images[Build], or click the build icon in the menu:Images[Profiles] list.

.Procedure: Building an Image
Expand Down
Loading