summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2024-01-29 18:41:32 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-02-01 14:15:13 +0000
commiteccd6f11b881d51bbb4691c0d12b72d16cd60ca9 (patch)
treea0722baebcf6441692aee9423cba1197e67a3f5f
parentfd1010ef24a7fc2de9a6b623212f332919c502af (diff)
downloadmeta-virtualization-eccd6f11b881d51bbb4691c0d12b72d16cd60ca9.tar.gz
container-host-config:storage.conf: sync with libpod v4.8.2
The current storage.conf is based on v1.33.0 of: https://github.com/containers/storage.git while in podman v4.8.2, it has been upgraded to v1.50.3-0.20231005112617-44418abb2d89 of: https://github.com/containers/storage.git let's sync it with podman v4.8.2. which comprises the following commits in storage.conf: ``` 42d1d9637 Run codespell on code 91da0c2be add documentation on imagestore and add a warning if set 01fccaa58 options: enable Remap-User/Group setting e125790e9 Fix typo in storage.conf 57582350c Document transient_store in man page 522b67c94 Add new storage.conf option "transient_store" 5e9e2ba6b Revert incorrect "heeded" -> "needed" typo fix cffa19709 fix typos and spelling 268af0001 chunked: drop host dedup feature b64cfb4f4 Document the pull_options 17fccdc2d Clearup inheritance rules for storage.conf 3c76f174d Tell users who change graphroot location to fix the SELinux labels ``` Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/container-host-config/container-host-config/storage.conf62
1 files changed, 55 insertions, 7 deletions
diff --git a/recipes-containers/container-host-config/container-host-config/storage.conf b/recipes-containers/container-host-config/container-host-config/storage.conf
index 722750c0..cb4525f2 100644
--- a/recipes-containers/container-host-config/container-host-config/storage.conf
+++ b/recipes-containers/container-host-config/container-host-config/storage.conf
@@ -1,5 +1,14 @@
1# This file is is the configuration file for all tools 1# This file is the configuration file for all tools
2# that use the containers/storage library. 2# that use the containers/storage library. The storage.conf file
3# overrides all other storage.conf files. Container engines using the
4# container/storage library do not inherit fields from other storage.conf
5# files.
6#
7# Note: The storage.conf file overrides other storage.conf files based on this precedence:
8# /usr/containers/storage.conf
9# /etc/containers/storage.conf
10# $HOME/.config/containers/storage.conf
11# $XDG_CONFIG_HOME/containers/storage.conf (If XDG_CONFIG_HOME is set)
3# See man 5 containers-storage.conf for more information 12# See man 5 containers-storage.conf for more information
4# The "container storage" table contains all of the server options. 13# The "container storage" table contains all of the server options.
5[storage] 14[storage]
@@ -11,12 +20,28 @@ driver = "overlay"
11runroot = "/run/containers/storage" 20runroot = "/run/containers/storage"
12 21
13# Primary Read/Write location of container storage 22# Primary Read/Write location of container storage
23# When changing the graphroot location on an SELINUX system, you must
24# ensure the labeling matches the default locations labels with the
25# following commands:
26# semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH
27# restorecon -R -v /NEWSTORAGEPATH
14graphroot = "/var/lib/containers/storage" 28graphroot = "/var/lib/containers/storage"
15 29
30# Optional alternate location of image store if a location separate from the
31# container store is required. If set, it must be different than graphroot.
32# imagestore = ""
33
34
16# Storage path for rootless users 35# Storage path for rootless users
17# 36#
18# rootless_storage_path = "$HOME/.local/share/containers/storage" 37# rootless_storage_path = "$HOME/.local/share/containers/storage"
19 38
39# Transient store mode makes all container metadata be saved in temporary storage
40# (i.e. runroot above). This is faster, but doesn't persist across reboots.
41# Additional garbage collection must also be performed at boot-time, so this
42# option should remain disabled in most configurations.
43# transient_store = true
44
20[storage.options] 45[storage.options]
21# Storage options to be passed to underlying storage drivers 46# Storage options to be passed to underlying storage drivers
22 47
@@ -25,6 +50,28 @@ graphroot = "/var/lib/containers/storage"
25additionalimagestores = [ 50additionalimagestores = [
26] 51]
27 52
53# Allows specification of how storage is populated when pulling images. This
54# option can speed the pulling process of images compressed with format
55# zstd:chunked. Containers/storage looks for files within images that are being
56# pulled from a container registry that were previously pulled to the host. It
57# can copy or create a hard link to the existing file when it finds them,
58# eliminating the need to pull them from the container registry. These options
59# can deduplicate pulling of content, disk storage of content and can allow the
60# kernel to use less memory when running containers.
61
62# containers/storage supports three keys
63# * enable_partial_images="true" | "false"
64# Tells containers/storage to look for files previously pulled in storage
65# rather then always pulling them from the container registry.
66# * use_hard_links = "false" | "true"
67# Tells containers/storage to use hard links rather then create new files in
68# the image, if an identical file already existed in storage.
69# * ostree_repos = ""
70# Tells containers/storage where an ostree repository exists that might have
71# previously pulled content which can be used when attempting to avoid
72# pulling content from the container registry
73pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
74
28# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of 75# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
29# a container, to the UIDs/GIDs as they should appear outside of the container, 76# a container, to the UIDs/GIDs as they should appear outside of the container,
30# and the length of the range of UIDs/GIDs. Additional mapped sets can be 77# and the length of the range of UIDs/GIDs. Additional mapped sets can be
@@ -32,8 +79,8 @@ additionalimagestores = [
32# mappings which the kernel will allow when you later attempt to run a 79# mappings which the kernel will allow when you later attempt to run a
33# container. 80# container.
34# 81#
35# remap-uids = 0:1668442479:65536 82# remap-uids = "0:1668442479:65536"
36# remap-gids = 0:1668442479:65536 83# remap-gids = "0:1668442479:65536"
37 84
38# Remap-User/Group is a user name which can be used to look up one or more UID/GID 85# Remap-User/Group is a user name which can be used to look up one or more UID/GID
39# ranges in the /etc/subuid or /etc/subgid file. Mappings are set up starting 86# ranges in the /etc/subuid or /etc/subgid file. Mappings are set up starting
@@ -41,7 +88,8 @@ additionalimagestores = [
41# range that matches the specified name, and using the length of that range. 88# range that matches the specified name, and using the length of that range.
42# Additional ranges are then assigned, using the ranges which specify the 89# Additional ranges are then assigned, using the ranges which specify the
43# lowest host-level IDs first, to the lowest not-yet-mapped in-container ID, 90# lowest host-level IDs first, to the lowest not-yet-mapped in-container ID,
44# until all of the entries have been used for maps. 91# until all of the entries have been used for maps. This setting overrides the
92# Remap-UIDs/GIDs setting.
45# 93#
46# remap-user = "containers" 94# remap-user = "containers"
47# remap-group = "containers" 95# remap-group = "containers"
@@ -57,7 +105,7 @@ additionalimagestores = [
57# Auto-userns-min-size is the minimum size for a user namespace created automatically. 105# Auto-userns-min-size is the minimum size for a user namespace created automatically.
58# auto-userns-min-size=1024 106# auto-userns-min-size=1024
59# 107#
60# Auto-userns-max-size is the minimum size for a user namespace created automatically. 108# Auto-userns-max-size is the maximum size for a user namespace created automatically.
61# auto-userns-max-size=65536 109# auto-userns-max-size=65536
62 110
63[storage.options.overlay] 111[storage.options.overlay]
@@ -113,7 +161,7 @@ mountopt = "nodev"
113# future. When "force_mask" is set the original permission mask is stored in 161# future. When "force_mask" is set the original permission mask is stored in
114# the "user.containers.override_stat" xattr and the "mount_program" option must 162# the "user.containers.override_stat" xattr and the "mount_program" option must
115# be specified. Mount programs like "/usr/bin/fuse-overlayfs" present the 163# be specified. Mount programs like "/usr/bin/fuse-overlayfs" present the
116# extended attribute permissions to processes within containers rather then the 164# extended attribute permissions to processes within containers rather than the
117# "force_mask" permissions. 165# "force_mask" permissions.
118# 166#
119# force_mask = "" 167# force_mask = ""