Hello community, here is the log from the commit of package libcontainers-common for openSUSE:Factory checked in at 2018-09-05 13:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old) and /work/SRC/openSUSE:Factory/.libcontainers-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common" Wed Sep 5 13:46:19 2018 rev:4 rq:631824 version:0.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes 2018-04-17 11:09:20.321421874 +0200 +++ /work/SRC/openSUSE:Factory/.libcontainers-common.new/libcontainers-common.changes 2018-09-05 13:46:21.186036008 +0200 @@ -1,0 +2,26 @@ +Mon Aug 27 14:24:51 UTC 2018 - vrothb...@suse.com + +- storage.conf: comment out options that are not supported by btrfs. + This simplifies switching the driver as it avoids the whack-a-mole + of commenting out "unsupported" options. + +------------------------------------------------------------------- +Mon Aug 27 08:48:16 UTC 2018 - vrothb...@suse.com + +- Consolidate libcontainers-{common,image,storage} into one package, + libcontainers-common. That's the way upstream intended all libraries from + github.com/containers to be packaged. It facilitates updating and maintaining + the package, as all configs and manpages come from a central source. + + Note that the `storage` binary that previously has been provided by the + libcontainers-storage package is not provided anymore as, despite the claims + in the manpages, it is not intended for production use. + +------------------------------------------------------------------- +Mon Aug 13 11:44:31 UTC 2018 - vrothb...@suse.com + +- Make libcontainers-common arch independent. + +- Add LICENSE. + +------------------------------------------------------------------- New: ---- LICENSE _service image.tar.xz mounts.conf registries.conf seccomp.json storage.conf storage.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcontainers-common.spec ++++++ --- /var/tmp/diff_new_pack.rh7feF/_old 2018-09-05 13:46:21.738036933 +0200 +++ /var/tmp/diff_new_pack.rh7feF/_new 2018-09-05 13:46:21.746036947 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,33 +22,93 @@ Summary: Configuration files common to github.com/containers License: Apache-2.0 Group: System/Management -Url: https://github.com/containers -Source0: policy.json +URL: https://github.com/containers +Source0: image.tar.xz +Source1: storage.tar.xz +Source2: LICENSE +Source3: policy.json +Source4: storage.conf +Source5: mounts.conf +Source6: registries.conf +Source7: seccomp.json +BuildRequires: go-go-md2man +Provides: libcontainers-image +Provides: libcontainers-storage +Obsoletes: libcontainers-image +Obsoletes: libcontainers-storage +BuildArch: noarch %description -Configuration files common to github.com/containers, a collection of golang -libraries, configuration files, manpages, and debugging tools used by various -tools, such as skopeo, cri-o and podman. +Configuration files and manpages shared by tools that are based on the +github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo. %prep -# nothing to do +%setup -q -T -D -b 0 -n image +%setup -q -T -D -b 1 -n storage +# copy the LICENSE file in the build root +cd .. +cp %{SOURCE2} . %build -# nothing to do +cd .. +pwd +# compile containers/image manpages +cd image +for md in docs/*.md +do + go-md2man -in $md -out $md +done +rename '.5.md' '.5' docs/* +rename '.md' '.1' docs/* +cd .. +# compile containers/storage manpages +cd storage +for md in docs/*.5.md +do + go-md2man -in $md -out $md +done +rename '.5.md' '.5' docs/* +cd .. %install +cd .. install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers/oci/hooks.d -install -D -m 0644 %{SOURCE0} %{buildroot}/%{_sysconfdir}/containers/policy.json -install -d -m 0755 %{buildroot}/%{_prefix}/share/containers/oci/hooks.d +install -d -m 0755 %{buildroot}/%{_datadir}/containers/oci/hooks.d +install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers/registries.d + +install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json +install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.conf +install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf +install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf +install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf +install -D -m 0644 %{SOURCE7} %{buildroot}/%{_datadir}/containers/seccomp.json +install -D -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/containers/seccomp.json + +install -d %{buildroot}/%{_mandir}/man1 +install -d %{buildroot}/%{_mandir}/man5 +install -D -m 0644 image/docs/*.1 %{buildroot}/%{_mandir}/man1/ +install -D -m 0644 storage/docs/*.5 %{buildroot}/%{_mandir}/man5/ %files %dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers/oci %dir %{_sysconfdir}/containers/oci/hooks.d -%dir %{_prefix}/share/containers -%dir %{_prefix}/share/containers/oci -%dir %{_prefix}/share/containers/oci/hooks.d +%dir %{_sysconfdir}/containers/registries.d +%dir %{_datadir}/containers +%dir %{_datadir}/containers/oci +%dir %{_datadir}/containers/oci/hooks.d + %config(noreplace) %{_sysconfdir}/containers/policy.json +%config(noreplace) %{_sysconfdir}/containers/storage.conf +%config(noreplace) %{_sysconfdir}/containers/mounts.conf +%{_datadir}/containers/mounts.conf +%config(noreplace) %{_sysconfdir}/containers/registries.conf +%config(noreplace) %{_sysconfdir}/containers/seccomp.json +%{_datadir}/containers/seccomp.json + +%{_mandir}/man1/*.1%{?ext_man} +%{_mandir}/man5/*.5%{?ext_man} +%license LICENSE %changelog ++++++ LICENSE ++++++ Apache License Version 2.0, January 2004 https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/containers/storage.git</param> <param name="scm">git</param> <param name="filename">storage</param> <param name="versionformat"></param> <param name="revision">17c7d1fee5603ccf6dd97edc14162fc1510e7e23</param> </service> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/containers/image.git</param> <param name="scm">git</param> <param name="filename">image</param> <param name="versionformat"></param> <param name="revision">ba6ac83aaf1d58c9f8904a9f202a3456d1ddba84</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ mounts.conf ++++++ # This configuration file specifies the default mounts for each container of the # tools adhering to this file (e.g., CRI-O, Podman, Buildah). The format of the # config is /SRC:/DST, one mount per line. ++++++ registries.conf ++++++ # For more information on this configuration file, see containers-registries.conf(5). # # Registries to search for images that are not fully-qualified. # i.e. foobar.com/my_image:latest vs my_image:latest [registries.search] registries = ["docker.io"] # Registries that do not use TLS when pulling images or uses self-signed # certificates. [registries.insecure] registries = [] # Blocked Registries, blocks the `docker daemon` from pulling from the blocked registry. If you specify # "*", then the docker daemon will only be allowed to pull from registries listed above in the search # registries. Blocked Registries is deprecated because other container runtimes and tools will not use it. # It is recommended that you use the trust policy file /etc/containers/policy.json to control which # registries you want to allow users to pull and push from. policy.json gives greater flexibility, and # supports all container runtimes and tools including the docker daemon, cri-o, buildah ... [registries.block] registries = [] ++++++ seccomp.json ++++++ ++++ 755 lines (skipped) ++++++ storage.conf ++++++ # This file is is the configuration file for all tools # that use the containers/storage library. # See man 5 containers-storage.conf for more information # The "container storage" table contains all of the server options. [storage] # Default Storage Driver driver = "" # Temporary storage location runroot = "/var/run/containers/storage" # Primary Read/Write location of container storage graphroot = "/var/lib/containers/storage" [storage.options] # Storage options to be passed to underlying storage drivers # AdditionalImageStores is used to pass paths to additional Read/Only image stores # Must be comma separated list. additionalimagestores = [ ] # Size is used to set a maximum size of the container image. Only supported by # certain container storage drivers. size = "" # Path to an helper program to use for mounting the file system instead of mounting it # directly. #mount_program = "/usr/bin/fuse-overlayfs" # OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version # override_kernel_check = "false" # mountopt specifies comma separated list of extra mount options # mountopt = "nodev" # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of # a container, to UIDs/GIDs as they should appear outside of the container, and # the length of the range of UIDs/GIDs. Additional mapped sets can be listed # and will be heeded by libraries, but there are limits to the number of # mappings which the kernel will allow when you later attempt to run a # container. # # remap-uids = 0:1668442479:65536 # remap-gids = 0:1668442479:65536 # Remap-User/Group is a name which can be used to look up one or more UID/GID # ranges in the /etc/subuid or /etc/subgid file. Mappings are set up starting # with an in-container ID of 0 and the a host-level ID taken from the lowest # range that matches the specified name, and using the length of that range. # Additional ranges are then assigned, using the ranges which specify the # lowest host-level IDs first, to the lowest not-yet-mapped container-level ID, # until all of the entries have been used for maps. # # remap-user = "storage" # remap-group = "storage" # If specified, use OSTree to deduplicate files with the overlay backend ostree_repo = "" # Set to skip a PRIVATE bind mount on the storage home directory. Only supported by # certain container storage drivers # skip_mount_home = "false" [storage.options.thinpool] # Storage Options for thinpool # autoextend_percent determines the amount by which pool 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. # autoextend_percent = "20" # autoextend_threshold determines the pool 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. # autoextend_threshold = "80" # basesize specifies the size to use when creating the base device, which # limits the size of images and containers. # basesize = "10G" # blocksize specifies a custom blocksize to use for the thin pool. # blocksize="64k" # directlvm_device specifies a custom block storage device to use for the # thin pool. Required if you setup devicemapper. # directlvm_device = "" # directlvm_device_force wipes device even if device already has a filesystem. # directlvm_device_force = "True" # fs specifies the filesystem type to use for the base device. # fs="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 # log_level = "7" # 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 # min_free_space = "10%" # mkfsarg specifies extra mkfs arguments to be used when creating the base. # device. # mkfsarg = "" # use_deferred_removal marks devicemapper block device for deferred removal. # If the thinpool is in use when the driver attempts to remove it, the driver # tells the kernel to remove it as soon as possible. Note this does not free # up the disk space, use deferred deletion to fully remove the thinpool. # use_deferred_removal = "True" # use_deferred_deletion marks thinpool device for deferred deletion. # If the device is busy when the driver attempts to delete it, the driver # will attempt to delete device every 30 seconds until successful. # If the program using the driver exits, the driver will continue attempting # to cleanup the next time the driver is used. Deferred deletion permanently # deletes the device and all data stored in device will be lost. # use_deferred_deletion = "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. # xfs_nospace_max_retries = "0"