Update container/storage.conf and containers-storage.conf man page

Default override to true so it is consistent with RHEL.
This commit is contained in:
Daniel J Walsh 2017-10-12 17:46:12 +00:00
parent e729b75772
commit a3d34514eb
3 changed files with 27 additions and 4 deletions

View File

@ -28,7 +28,6 @@ No bare options are used. The format of TOML can be simplified to:
The `storage` table supports the following options: The `storage` table supports the following options:
**graphroot**="" **graphroot**=""
container storage graph dir (default: "/var/lib/containers/storage") container storage graph dir (default: "/var/lib/containers/storage")
Default directory to store all writable content created by container storage programs Default directory to store all writable content created by container storage programs
@ -41,8 +40,21 @@ The `storage` table supports the following options:
container storage driver (default is "overlay") container storage driver (default is "overlay")
Default Copy On Write (COW) container storage driver Default Copy On Write (COW) container storage driver
### STORAGE OPTIONS TABLE
The `storage.options` table supports the following options:
**additionalimagestores**=[] **additionalimagestores**=[]
Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares. Paths to additional container image stores. Usually these are read/only and stored on remote network shares.
**size**=""
Maximum size of a container image. Default is 10GB. This flag can be used to set quota
on the size of container images.
**override_kernel_check**=""
Tell storage drivers to ignore kernel version checks. Some storage drivers assume that if a kernel is too
old, the driver is not supported. But for kernels that have had the drivers backported, this flag
allows users to override the checks
# HISTORY # HISTORY
May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com> May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>

View File

@ -38,13 +38,13 @@ Name: %{repo}
Epoch: 1 Epoch: 1
%endif # centos %endif # centos
Version: 0.1.24 Version: 0.1.24
Release: 3.dev.git%{shortcommit0}%{?dist} Release: 4.dev.git%{shortcommit0}%{?dist}
Summary: Inspect Docker images and repositories on registries Summary: Inspect Docker images and repositories on registries
License: ASL 2.0 License: ASL 2.0
URL: %{git0} URL: %{git0}
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
Source1: storage.conf Source1: storage.conf
Source2: storage.conf.5.md Source2: containers-storage.conf.5.md
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: go-srpm-macros BuildRequires: go-srpm-macros
@ -289,6 +289,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
%changelog %changelog
* Thu Oct 12 2017 dwalsh <dwalsh@redhat.com> - 0.1.24-4.dev.git28d4e08
- Update container/storage.conf and containers-storage.conf man page
- Default override to true so it is consistent with RHEL.
* Tue Oct 10 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.1.24-3.dev.git28d4e08 * Tue Oct 10 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.1.24-3.dev.git28d4e08
- built commit 28d4e08 - built commit 28d4e08

View File

@ -19,3 +19,10 @@ graphroot = "/var/lib/containers/storage"
# Must be comma separated list. # Must be comma separated list.
additionalimagestores = [ additionalimagestores = [
] ]
# Size is used to set a maximum size of the container image. Only supported by
# certain container storage drivers.
size = ""
# OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
override_kernel_check = "true"