From 70baf348fb3ee200e825c2b6d34621764a7ba210 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: May 20 2018 11:58:53 +0000 Subject: Add devicemapper support --- diff --git a/.gitignore b/.gitignore index e98cce6..ed3a536 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /skopeo-2d04db9.tar.gz /skopeo-7e9a664.tar.gz /skopeo.spec +/skopeo-ca3bff6.tar.gz diff --git a/containers-storage.conf.5.md b/containers-storage.conf.5.md index 429e42e..b2c71b1 100644 --- a/containers-storage.conf.5.md +++ b/containers-storage.conf.5.md @@ -40,7 +40,7 @@ The `storage` table supports the following options: container storage driver (default is "overlay") Default Copy On Write (COW) container storage driver -### STORAGE OPTIONS TABLE +### STORAGE OPTIONS TABLE The `storage.options` table supports the following options: @@ -56,6 +56,76 @@ The `storage.options` table supports the following options: old, the driver is not supported. But for kernels that have had the drivers backported, this flag allows users to override the checks +[storage.options.thinpool] + +Storage Options for thinpool + +The `storage.options.thinpool` table supports the following options: + +**autoextend_percent**="" + +Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (Default is 20%) + +**autoextend_threshold**="" + +Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (80% is the default) + +**basesize**="" + +Specifies the size to use when creating the base device, which limits the size of images and containers. (10g is the default) + +**blocksize**="" + +Specifies a custom blocksize to use for the thin pool. (64k is the default) + +**directlvm_device**="" + +Specifies a custom block storage device to use for the thin pool. Required if you setup devicemapper + +**directlvm_device_force**="" + +Tells driver to wipe device (directlvm_device) even if device already has a filesystem. Default is False + +**fs**="xfs" + +Specifies the filesystem type to use for the base device. (Default is xfs) + +**log_level**="" + +Sets the log level of devicemapper. + + 0: LogLevelSuppress 0 (Default) + 2: LogLevelFatal + 3: LogLevelErr + 4: LogLevelWarn + 5: LogLevelNotice + 6: LogLevelInfo + 7: LogLevelDebug + +**min_free_space**="" + +Specifies the min free space percent in a thin pool require for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables (10% is the default) + +**mkfsarg**="" + +Specifies extra mkfs arguments to be used when creating the base device. + +**mountopt**="" + +Specifies extra mount options used when mounting the thin devices. + +**use_deferred_removal**="" + +Marks device for deferred removal. If the device is in use when it driver attempts to remove it, driver will tell the kernel to remove it as soon as possible. (Default is true). + +**use_deferred_deletion**="" + +Marks device for deferred deletion. If the device is in use when it driver attempts to delete it, driver continue to attempt to delete device every 30 seconds, or when it restarts. (Default is true). + +**xfs_nospace_max_retries**="" + +Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (Default is 0, which means to try continuously. + # HISTORY May 2017, Originally compiled by Dan Walsh Format copied from crio.conf man page created by Aleksa Sarai diff --git a/skopeo.spec b/skopeo.spec index 1606124..0fbf7e4 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -362,7 +362,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Sun Apr 08 2018 Lokesh Mandvekar - 0.1.30-1.git28080c8 - bump to 0.1.30 - autobuilt commit 28080c8 - * Tue Apr 03 2018 baude - 0.1.29-5.git7add6fc - Fix small typo in registries.conf diff --git a/sources b/sources index 466332f..7506331 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skopeo.spec) = 4f2c667c55206bb381570bd7669c4f89ed7c70d0bcd5eebf45254ccaa70bbf5c0f371e87512439f40ac842af473cf3e0d2b5a6d48a5fbd27157a2f6bfc60d4ec +SHA512 (skopeo-ca3bff6.tar.gz) = 76485089aa445226156341aa0cf2dd8735fae102feded1c8bf7594773ff1f10db7a52ab1b74e68e9f79dbd03b39de5479dc38e6fa900cd6ebd00293e098c337f