- Move the following distro configs files to /usr/share/containers/:

* /etc/containers/mounts.json
    * /etc/containers/storage.conf
    * /etc/containers/seccomp.json
- New release 20240618

OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=40
This commit is contained in:
Dan Čermák 2024-06-20 14:25:28 +00:00 committed by Git OBS Bridge
parent 16bf5ff722
commit 623e33414c
9 changed files with 32 additions and 24 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.53.0</param>
<param name="revision">v1.54.0</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.30.0</param>
<param name="revision">v5.31.0</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.58.0</param>
<param name="revision">v0.59.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>

BIN
common-0.58.0.tar.xz (Stored with Git LFS)

Binary file not shown.

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

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

BIN
image-5.30.0.tar.xz (Stored with Git LFS)

Binary file not shown.

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

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

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jun 18 06:53:50 UTC 2024 - Danish Prakash <danish.prakash@suse.com>
- Move the following distro configs files to /usr/share/containers/:
* /etc/containers/mounts.json
* /etc/containers/storage.conf
* /etc/containers/seccomp.json
- New release 20240618
- bump bundled c/common to 0.59.1
- bump bundled c/image to 5.31.0
- bump bundled c/storage to 1.54.0
-------------------------------------------------------------------
Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prakash@suse.com>

View File

@ -17,17 +17,17 @@
# commonver - version from containers/common
%define commonver 0.58.0
%define commonver 0.59.1
# storagever - version from containers/storage
%define storagever 1.53.0
%define storagever 1.54.0
# imagever - version from containers/image
%define imagever 5.30.0
%define imagever 5.31.0
# skopeover - version from containers/skopeo
%define skopeover 1.15.0
%define skopeover 1.14.4
# https://github.com/containers/shortnames
%define shortnamesver 2023.02.20
Name: libcontainers-common
Version: 20240408
Version: 20240618
Release: 0
Summary: Configuration files common to github.com/containers
License: Apache-2.0
@ -182,14 +182,12 @@ install -d -m 0755 %{buildroot}/%{_datadir}/containers/systemd
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.default
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE
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 %{SOURCE4} %{buildroot}/%{_datadir}/containers/storage.conf
install -D -m 0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
install -D -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
install -D -m 0644 %_builddir/containers.conf %{buildroot}/%{_datadir}/containers/containers.conf
install -D -m 0644 common-%{commonver}/pkg/seccomp/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
install -D -m 0644 common-%{commonver}/pkg/seccomp/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json
install -d %{buildroot}/%{_mandir}/man1
install -d %{buildroot}/%{_mandir}/man5
@ -209,7 +207,7 @@ install -D -m 0644 registries.conf.suse %{buildroot}/%{_sysconfdir}/containers/r
%post
# Comment out ostree_repo if it's blank [boo#1189893]
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf
if [ -f %{_sysconfdir}/containers/storage.conf ]; then sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf; fi
%files
%dir %{_sysconfdir}/containers
@ -223,11 +221,10 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
%dir %{_datadir}/containers/oci/hooks.d
%dir %{_datadir}/containers/systemd
%config(noreplace) %{_sysconfdir}/containers/storage.conf
%config(noreplace) %{_sysconfdir}/containers/seccomp.json
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
%{_datadir}/containers/seccomp.json
%{_datadir}/containers/storage.conf
%{_datadir}/containers/containers.conf
%{_mandir}/man1/*.1%{?ext_man}
@ -235,7 +232,6 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
%license LICENSE
%files -n libcontainers-sles-mounts
%config(noreplace) %{_sysconfdir}/containers/mounts.conf
%{_datadir}/containers/mounts.conf
%files -n libcontainers-openSUSE-policy

BIN
storage-1.53.0.tar.xz (Stored with Git LFS)

Binary file not shown.

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

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