diff --git a/.gitignore b/.gitignore index aaa9d46..5a20c88 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skopeo-ae64ff7.tar.gz +SOURCES/skopeo-b0b750d.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 77f4555..61af1ea 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -043c6bc8437e45cdb13881b9b90fef5c89738bcd SOURCES/skopeo-ae64ff7.tar.gz +a30fc77726de0c85cba200b79d192155adb44002 SOURCES/skopeo-b0b750d.tar.gz diff --git a/SOURCES/containers-storage.conf.5.md b/SOURCES/containers-storage.conf.5.md index 429e42e..625dadc 100644 --- a/SOURCES/containers-storage.conf.5.md +++ b/SOURCES/containers-storage.conf.5.md @@ -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/SOURCES/registries.conf b/SOURCES/registries.conf index ff4a5e5..fee6fa9 100644 --- a/SOURCES/registries.conf +++ b/SOURCES/registries.conf @@ -9,7 +9,7 @@ # and 'registries.block'. [registries.search] -registries = ['docker.io','registry.centos.org','registry.access.redhat.com'] +registries = ['registry.access.redhat.com', 'docker.io', 'registry.fedoraproject.org', 'quay.io', 'registry.centos.org'] # If you need to access insecure registries, add the registry's fully-qualified name. # An insecure registry is one that does not have a valid SSL certificate or only does HTTP. diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 372a5e2..d58e8a7 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -17,14 +17,14 @@ # https://github.com/projectatomic/skopeo %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 ae64ff7084c8ba60275232740b79c1876f8a5256 +%global commit0 b0b750dfa1bc598a643945c7f292204fa0f0bf09 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} Name: %{repo} Epoch: 1 Version: 0.1.31 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 7.git%{shortcommit0}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -34,12 +34,15 @@ Source2: containers-storage.conf.5.md Source3: mounts.conf Source4: registries.conf Source5: registries.conf.5.md +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 BuildRequires: git +%if 0%{?fedora} || 0%{?centos} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2 -%if 0%{?rhel} > 7 +%else BuildRequires: go-toolset-7-golang-bin BuildRequires: go-toolset-7-runtime +BuildRequires: openssl-devel %endif BuildRequires: go-md2man BuildRequires: gpgme-devel @@ -49,26 +52,26 @@ BuildRequires: device-mapper-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(ostree-1) -Requires: %{name}-containers = %{epoch}:%{version}-%{release} +Requires: containers-common = %{epoch}:%{version}-%{release} %description Command line utility to inspect images and repositories directly on Docker registries without the need to pull them -%package containers +%package -n containers-common Summary: Configuration files for working with image signature # /etc/containers/registries.d/default.yaml has been moved from atomic to -# skopeo-containers +# containers-common Conflicts: atomic <= 1:1.13.1-1 Conflicts: atomic-registries <= 1:1.22.1-2 +Provides: skopeo-containers = %{epoch}:%{version}-%{release} +Obsoletes: skopeo-containers < 1:0.1.31-2 -%description containers +%description -n containers-common This package installs a default signature store configuration policy under `/etc/containers/`. -%if 0%{?rhel} > 7 -%{enable_gotoolset7} -%endif +%{?enable_gotoolset7} %prep %autosetup -Sgit -n %{name}-%{commit0} @@ -85,7 +88,7 @@ for v in vendor/*; do fi done -export GOPATH=$(pwd):$(pwd)/vendor:%{gopath} +export GOPATH=$(pwd):$(pwd)/vendor %if ! 0%{?gobuild:1} %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; @@ -126,7 +129,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files containers +%files -n containers-common %dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers/registries.d %config(noreplace) %{_sysconfdir}/containers/policy.json @@ -152,8 +155,21 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name} %changelog -* Mon Jul 16 2018 Johnny Hughes - 0.1.31-1.dev.gitae64ff7 -- Manual CentOS Debranding +* Mon Nov 19 2018 Lokesh Mandvekar - 1:0.1.31-7.gitb0b750d +- change obsoletes conditional for skopeo-containers + +* Mon Nov 19 2018 Lokesh Mandvekar - 1:0.1.31-6.gitb0b750d +- properly obsolete 1:0.1.31-1 + +* Fri Nov 09 2018 Frantisek Kluknavsky - 1:0.1.31-5.gitb0b750d +- macros for centos + +* Tue Nov 06 2018 Frantisek Kluknavsky - 1:0.1.31-4.gitb0b750d +- rebase + +* Wed Jul 25 2018 dwalsh - 0.1.31-2.gite3034e1 +- add statx to seccomp.json to containers-config +- Change skopeo-containers to containers-common * Wed Jul 11 2018 Lokesh Mandvekar - 0.1.31-1.dev.gitae64ff7 - Resolves: #1599980, #1599224