From 8f93fc5578f8d6bfa01a7040a78d2236e8c4d3d0 Mon Sep 17 00:00:00 2001 From: Ed Baunton Date: Fri, 16 Feb 2024 05:57:41 -0500 Subject: [PATCH 1/2] Synchronise documentation for convert_images flag Synchronise documentation around the configuration file to accurately reflect new `convert_images` flag. Signed-off-by: Ed Baunton --- docs/containers-storage.conf.5.md | 4 ++-- storage.conf | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/containers-storage.conf.5.md b/docs/containers-storage.conf.5.md index 3950b8671a..53113ecb40 100644 --- a/docs/containers-storage.conf.5.md +++ b/docs/containers-storage.conf.5.md @@ -95,7 +95,7 @@ container registry. These options can deduplicate pulling of content, disk storage of content and can allow the kernel to use less memory when running containers. -containers/storage supports three keys +containers/storage supports four keys * enable_partial_images="true" | "false" Tells containers/storage to look for files previously pulled in storage rather then always pulling them from the container registry. @@ -107,7 +107,7 @@ containers/storage supports three keys previously pulled content which can be used when attempting to avoid pulling content from the container registry * convert_images = "false" | "true" - If set to true, containers/storage will convert images to the a format compatible with + If set to true, containers/storage will convert images to a format compatible with partial pulls in order to take advantage of local deduplication and hardlinking. It is an expensive operation so it is not enabled by default. diff --git a/storage.conf b/storage.conf index 0bb324c506..b39fb32f9a 100644 --- a/storage.conf +++ b/storage.conf @@ -59,7 +59,7 @@ additionalimagestores = [ # can deduplicate pulling of content, disk storage of content and can allow the # kernel to use less memory when running containers. -# containers/storage supports three keys +# containers/storage supports four keys # * enable_partial_images="true" | "false" # Tells containers/storage to look for files previously pulled in storage # rather then always pulling them from the container registry. @@ -70,6 +70,11 @@ additionalimagestores = [ # Tells containers/storage where an ostree repository exists that might have # previously pulled content which can be used when attempting to avoid # pulling content from the container registry +# * convert_images = "false" | "true" +# If set to true, containers/storage will convert images to a +# format compatible with partial pulls in order to take advantage +# of local deduplication and hardlinking. It is an expensive +# operation so it is not enabled by default. pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""} # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of From d0821d1eac4eb9ee996e2cfbe32f042a0be4c6f6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 18 Feb 2024 06:43:18 -0500 Subject: [PATCH 2/2] Update storage.conf Co-authored-by: Tom Sweeney Signed-off-by: Daniel J Walsh --- storage.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage.conf b/storage.conf index b39fb32f9a..924e8f13a5 100644 --- a/storage.conf +++ b/storage.conf @@ -73,7 +73,7 @@ additionalimagestores = [ # * convert_images = "false" | "true" # If set to true, containers/storage will convert images to a # format compatible with partial pulls in order to take advantage -# of local deduplication and hardlinking. It is an expensive +# of local deduplication and hard linking. It is an expensive # operation so it is not enabled by default. pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""}