Accepting request 1066857 from home:dancermak:branches:devel:microos

New upstream release 20230214

OBS-URL: https://build.opensuse.org/request/show/1066857
OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=15
This commit is contained in:
Richard Brown 2023-02-20 16:50:06 +00:00 committed by Git OBS Bridge
parent 81680e50bf
commit e0e22282cb
12 changed files with 102 additions and 31 deletions

View File

@ -3,7 +3,7 @@
<param name="url">https://github.com/containers/storage.git</param>
<param name="scm">git</param>
<param name="filename">storage</param>
<param name="revision">v1.44.0</param>
<param name="revision">v1.45.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
@ -11,7 +11,7 @@
<param name="url">https://github.com/containers/image.git</param>
<param name="scm">git</param>
<param name="filename">image</param>
<param name="revision">v5.23.1</param>
<param name="revision">v5.24.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
@ -19,7 +19,7 @@
<param name="url">https://github.com/containers/common.git</param>
<param name="scm">git</param>
<param name="filename">common</param>
<param name="revision">v0.50.1</param>
<param name="revision">v0.51.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b5a1f9351a27dff49b27bf915a4c4ed844c00f347cd67f1f569884ed2438c3e
size 5141248

3
common-0.51.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f66f6847cf279388efcb3a3dbff824503822116769d7e8fdfba8daf3aa7e22fe
size 5847736

View File

@ -216,6 +216,10 @@ log_driver = "journald"
#
#prepare_volume_on_create = false
# Run all containers with root file system mounted read-only
#
# read_only = false
# Path to the seccomp.json profile which is used as the default seccomp profile
# for the runtime.
#
@ -244,12 +248,6 @@ log_driver = "journald"
#
#userns = "host"
# Number of UIDs to allocate for the automatic container creation.
# UIDs are allocated from the "container" UIDs listed in
# /etc/subuid & /etc/subgid
#
#userns_size = 65536
# Default way to to create a UTS namespace for the container
# Options are:
# `private` Create private UTS Namespace for the container.
@ -263,6 +261,11 @@ log_driver = "journald"
# If it is empty or commented out, no volumes will be added
#
#volumes = []
#
#[engine.platform_to_oci_runtime]
#"wasi/wasm" = ["crun-wasm"]
#"wasi/wasm32" = ["crun-wasm"]
#"wasi/wasm64" = ["crun-wasm"]
[secrets]
#driver = "file"
@ -405,6 +408,10 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
#
#events_logger = "journald"
# Creates a more verbose container-create event which includes a JSON payload
# with detailed information about the container.
#events_container_create_inspect_data = false
# A is a list of directories which are used to search for helper binaries.
#
#helper_binaries_dir = [
@ -537,7 +544,7 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
# List of the OCI runtimes that support --format=json. When json is supported
# engine will use it for reporting nicer errors.
#
#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"]
#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun"]
# List of the OCI runtimes that supports running containers with KVM Separation.
#
@ -599,6 +606,12 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
#
#volume_path = "/var/lib/containers/storage/volumes"
# Default timeout (in seconds) for volume plugin operations.
# Plugins are external programs accessed via a REST API; this sets a timeout
# for requests to that API.
# A value of 0 is treated as no timeout.
#volume_plugin_timeout = 5
# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc)
[engine.runtimes]
#crun = [
@ -642,6 +655,13 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
# "/run/current-system/sw/bin/runsc",
#]
#youki = [
# "/usr/local/bin/youki",
# "/usr/bin/youki",
# "/bin/youki",
# "/run/current-system/sw/bin/youki",
#]
#krun = [
# "/usr/bin/krun",
# "/usr/local/bin/krun",
@ -659,7 +679,14 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
#
#disk_size=10
# The image used when creating a podman-machine VM.
# Default image URI when creating a new VM using `podman machine init`.
# Options: On Linux/Mac, `testing`, `stable`, `next`. On Windows, the major
# version of the OS (e.g `36`) for Fedora 36. For all platforms you can
# alternatively specify a custom download URL to an image. Container engines
# translate URIs $OS and $ARCH to the native OS and ARCH. URI
# "https://example.com/$OS/$ARCH/foobar.ami" becomes
# "https://example.com/linux/amd64/foobar.ami" on a Linux AMD machine.
# The default value is `testing`.
#
#image = "testing"
@ -681,6 +708,11 @@ cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
# "$HOME:$HOME",
#]
# Virtualization provider used to run Podman machine.
# If it is empty or commented out, the default provider will be used.
#
#provider = ""
# The [machine] table MUST be the last entry in this file.
# (Unless another table is added)
# TOML does not provide a way to end a table other than a further table being

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:816828e0d79d40aae82448a3750cf55d499a32689e457d1f23be943d7352a07e
size 461128

3
image-5.24.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:add3082054e013c0d820b9d4709c939b206b108bbe90536d11ae96eccba35e8c
size 536724

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Feb 14 13:28:21 UTC 2023 - Dan Čermák <dcermak@suse.com>
- New upstream release 20230214
- bump c/storage to 1.45.3
- bump c/image to 5.24.1
- bump c/common to 0.51.0
- containers.conf:
* add commented out options containers.read_only,
engine.platform_to_oci_runtime, engine.events_container_create_inspect_data,
network.volume_plugin_timeout, engine.runtimes.youki, machine.provider
* remove deprecated setting containers.userns_size
* add youki to engine.runtime_supports_json
- shortnames.conf: pull in latest upstream version
- storage.conf: add commented out option storage.transient_store
- correct license to APACHE-2.0 only (there's no GPLv3 code to be found)
- add source URLs to spec
- drop pointless copyright year
-------------------------------------------------------------------
Wed Jan 25 10:01:49 UTC 2023 - Danish Prakash <danish.prakash@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package libcontainers-common
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,35 +17,45 @@
# commonver - version from containers/common
%define commonver 0.50.1
%define commonver 0.51.0
# storagever - version from containers/storage
%define storagever 1.44.0
%define storagever 1.45.3
# imagever - version from containers/image
%define imagever 5.23.1
%define imagever 5.24.1
# skopeover - version from containers/skopeo
%define skopeover 1.11.1
# https://github.com/containers/shortnames
%define shortnamesver 2023.02.20
Name: libcontainers-common
Version: 20221122
Version: 20230214
Release: 0
Summary: Configuration files common to github.com/containers
License: Apache-2.0 AND GPL-3.0-or-later
License: Apache-2.0
Group: System/Management
URL: https://github.com/containers
Source0: image-%{imagever}.tar.xz
Source1: storage-%{storagever}.tar.xz
Source2: LICENSE
Source3: policy.json
# https://raw.githubusercontent.com/containers/skopeo/main/default-policy.json
Source3: https://raw.githubusercontent.com/containers/skopeo/v%{skopeover}/default-policy.json#./policy.json
# https://github.com/containers/storage/blob/main/storage.conf + custom changes
Source4: storage.conf
# heavily modified version of https://github.com/containers/common/blob/main/pkg/subscriptions/mounts.conf
Source5: mounts.conf
# https://raw.githubusercontent.com/containers/image/main/registries.conf with our own registries inserted
Source6: registries.conf
# https://github.com/containers/skopeo/blob/main/default.yaml but heavily modified
Source7: default.yaml
Source8: common-%{commonver}.tar.xz
# https://github.com/containers/common/blob/main/pkg/config/containers.conf with custom settings
Source9: containers.conf
Source10: %{name}.rpmlintrc
Source11: shortnames.conf
Source11: https://raw.githubusercontent.com/containers/shortnames/v%{shortnamesver}/shortnames.conf
Source12: container-storage-driver.sh
BuildRequires: go-go-md2man
Requires: util-linux-systemd
Requires(post): %{_bindir}/grep
Requires(post): %{_bindir}/sed
Requires: util-linux-systemd
Requires(post): util-linux-systemd
Provides: libcontainers-image = %{version}
Provides: libcontainers-storage = %{version}

View File

@ -3,7 +3,7 @@
"almalinux" = "docker.io/library/almalinux"
"almalinux-minimal" = "docker.io/library/almalinux-minimal"
# Arch Linux
"archlinux" = "docker.io/archlinux/archlinux"
"archlinux" = "docker.io/library/archlinux"
# centos
"centos" = "quay.io/centos/centos"
# containers
@ -42,6 +42,10 @@
"sles12sp5" = "registry.suse.com/suse/sles12sp5"
"sles12sp4" = "registry.suse.com/suse/sles12sp4"
"sles12sp3" = "registry.suse.com/suse/sles12sp3"
"bci/bci-base" = "registry.suse.com/bci/bci-base"
"bci/bci-micro" = "registry.suse.com/bci/bci-micro"
"bci/bci-minimal" = "registry.suse.com/bci/bci-minimal"
"bci/bci-busybox" = "registry.suse.com/bci/bci-busybox"
# Red Hat Enterprise Linux
"rhel" = "registry.access.redhat.com/rhel"
"rhel6" = "registry.access.redhat.com/rhel6"
@ -111,5 +115,7 @@
"php" = "docker.io/library/php"
# python
"python" = "docker.io/library/python"
# rust
"rust" = "docker.io/library/rust"
# node
"node" = "docker.io/library/node"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2b9051ba7e4243960bdeb821b8d1c9b79f78a49bfd1692ba8e0fb4004a6edc5
size 1870312

3
storage-1.45.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8aef2fd15882b375585702e78796ec3a00295747d90d168d35c010a829e3124
size 1885172

View File

@ -1,4 +1,4 @@
# This file is is the configuration file for all tools
# This file is the configuration file for all tools
# that use the containers/storage library. The storage.conf file
# overrides all other storage.conf files. Container engines using the
# container/storage library do not inherit fields from other storage.conf
@ -36,6 +36,10 @@ graphroot = "/var/lib/containers/storage"
#
# rootless_storage_path = "$HOME/.local/share/containers/storage"
# Transient store mode makes all container metadata be saved in temporary storage
# (i.e. runroot above). This is faster, but doesn't persist across reboots.
# transient_store = true
[storage.options]
# Storage options to be passed to underlying storage drivers