Accepting request 1038194 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1038194 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
d5b4d7892f
14
_service
14
_service
@ -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.38.2</param>
|
||||
<param name="revision">v1.44.0</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
</service>
|
||||
@ -11,15 +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.19.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/containers/podman.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">podman</param>
|
||||
<param name="revision">v3.4.4</param>
|
||||
<param name="revision">v5.23.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
</service>
|
||||
@ -27,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.47.3</param>
|
||||
<param name="revision">v0.50.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
</service>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3185d1fae6bea4b78294a7bac19a1fb60e7824a78cc9c11be9677582c02e6b5c
|
||||
size 4763172
|
||||
3
common-0.50.1.tar.xz
Normal file
3
common-0.50.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b5a1f9351a27dff49b27bf915a4c4ed844c00f347cd67f1f569884ed2438c3e
|
||||
size 5141248
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3334eed241701163e1fa0b17a4f8a0e1b448ce556600c3f7f4e26438969357bc
|
||||
size 400580
|
||||
3
image-5.23.1.tar.xz
Normal file
3
image-5.23.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:816828e0d79d40aae82448a3750cf55d499a32689e457d1f23be943d7352a07e
|
||||
size 461128
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:48:38 UTC 2022 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- Update bundled common to 0.50.1
|
||||
- Update bundled image to 5.23.1
|
||||
- Update bundled storage to 1.44.0
|
||||
- Drop bundled podman
|
||||
- Bump version to 20221122
|
||||
- Install container-storage-driver.sh in /etc/ on Leap & SLE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 17 10:51:26 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libcontainers-common
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,19 +17,13 @@
|
||||
|
||||
|
||||
# commonver - version from containers/common
|
||||
%define commonver 0.47.3
|
||||
|
||||
# podman - version from containers/podman
|
||||
%define podmanver 3.4.4
|
||||
|
||||
%define commonver 0.50.1
|
||||
# storagever - version from containers/storage
|
||||
%define storagever 1.38.2
|
||||
|
||||
%define storagever 1.44.0
|
||||
# imagever - version from containers/image
|
||||
%define imagever 5.19.1
|
||||
|
||||
%define imagever 5.23.1
|
||||
Name: libcontainers-common
|
||||
Version: 20210626
|
||||
Version: 20221122
|
||||
Release: 0
|
||||
Summary: Configuration files common to github.com/containers
|
||||
License: Apache-2.0 AND GPL-3.0-or-later
|
||||
@ -42,21 +36,20 @@ Source3: policy.json
|
||||
Source4: storage.conf
|
||||
Source5: mounts.conf
|
||||
Source6: registries.conf
|
||||
Source7: podman-%{podmanver}.tar.xz
|
||||
Source8: default.yaml
|
||||
Source9: common-%{commonver}.tar.xz
|
||||
Source10: containers.conf
|
||||
Source11: %{name}.rpmlintrc
|
||||
Source12: shortnames.conf
|
||||
Source13: container-storage-driver.sh
|
||||
Source7: default.yaml
|
||||
Source8: common-%{commonver}.tar.xz
|
||||
Source9: containers.conf
|
||||
Source10: %{name}.rpmlintrc
|
||||
Source11: shortnames.conf
|
||||
Source12: container-storage-driver.sh
|
||||
BuildRequires: go-go-md2man
|
||||
Requires(post): %{_bindir}/grep
|
||||
Requires(post): %{_bindir}/sed
|
||||
Requires(post): util-linux-systemd
|
||||
Provides: libcontainers-image = %{version}
|
||||
Provides: libcontainers-storage = %{version}
|
||||
Obsoletes: libcontainers-image < %{version}
|
||||
Obsoletes: libcontainers-storage < %{version}
|
||||
Requires(post): util-linux-systemd
|
||||
Requires(post): /usr/bin/grep
|
||||
Requires(post): /usr/bin/sed
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -64,7 +57,7 @@ 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
|
||||
%setup -Tcq -b0 -b1 -b7 -b9
|
||||
%setup -q -Tcq -b0 -b1 -b8
|
||||
# copy the LICENSE file in the build root
|
||||
cp %{SOURCE2} .
|
||||
|
||||
@ -89,8 +82,8 @@ done
|
||||
rename '.5.md' '.5' docs/*
|
||||
rename '.md' '.1' docs/*
|
||||
cd ..
|
||||
# compile subset of containers/podman manpages
|
||||
cd podman-%{podmanver}
|
||||
# compile subset of containers/common manpages
|
||||
cd common-%{commonver}
|
||||
go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5
|
||||
cd ..
|
||||
|
||||
@ -98,13 +91,13 @@ cd ..
|
||||
# no default mounts
|
||||
%else
|
||||
cat >>%{SOURCE5} <<EOL
|
||||
/etc/SUSEConnect:/etc/SUSEConnect
|
||||
/etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials
|
||||
%{_sysconfdir}/SUSEConnect:%{_sysconfdir}/SUSEConnect
|
||||
%{_sysconfdir}/zypp/credentials.d/SCCcredentials:%{_sysconfdir}/zypp/credentials.d/SCCcredentials
|
||||
EOL
|
||||
%endif
|
||||
|
||||
cd common-%{commonver}
|
||||
make docs
|
||||
%make_build docs
|
||||
cd ..
|
||||
|
||||
%install
|
||||
@ -120,11 +113,16 @@ install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.con
|
||||
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 %{SOURCE12} %{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
|
||||
install -D -m 0644 %{SOURCE13} %{buildroot}/usr/etc/profile.d/libcontainers-common-storage.sh
|
||||
install -D -m 0644 %{SOURCE8} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
|
||||
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE10}
|
||||
install -D -m 0644 %{SOURCE10} %{buildroot}/%{_datadir}/containers/containers.conf
|
||||
install -D -m 0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
|
||||
%if 0%{?suse_version} == 1500
|
||||
# /usr/etc/ does not work on Leap & SLE
|
||||
install -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
|
||||
%else
|
||||
install -D -m 0644 %{SOURCE12} %{buildroot}%{_prefix}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
|
||||
%endif
|
||||
install -D -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
|
||||
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE9}
|
||||
install -D -m 0644 %{SOURCE9} %{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
|
||||
|
||||
@ -134,18 +132,18 @@ install -D -m 0644 image-%{imagever}/docs/*.1 %{buildroot}/%{_mandir}/man1/
|
||||
install -D -m 0644 image-%{imagever}/docs/*.5 %{buildroot}/%{_mandir}/man5/
|
||||
install -D -m 0644 storage-%{storagever}/docs/*.1 %{buildroot}/%{_mandir}/man1/
|
||||
install -D -m 0644 storage-%{storagever}/docs/*.5 %{buildroot}/%{_mandir}/man5/
|
||||
install -D -m 0644 podman-%{podmanver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
|
||||
install -D -m 0644 common-%{commonver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/
|
||||
install -D -m 0644 common-%{commonver}/docs/containers-mounts.conf.5 %{buildroot}/%{_mandir}/man5/
|
||||
install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_mandir}/man5/
|
||||
|
||||
%post
|
||||
# Comment out ostree_repo if it's blank [boo#1189893]
|
||||
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' /etc/containers/storage.conf
|
||||
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf
|
||||
# use btrfs storage driver if system storage is on btrfs
|
||||
# For rootless it will fall back to overlay if btrfs is not working
|
||||
# https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md#storage-table
|
||||
if [ $1 -eq 1 ] ; then
|
||||
for dir in /var/lib/containers /var/lib ; do
|
||||
for dir in %{_localstatedir}/lib/containers %{_localstatedir}/lib ; do
|
||||
test "$(findmnt -o FSTYPE -l --target '$dir' | grep -v FSTYPE)" != "btrfs" && CONTAINERS_USE_BTRFS_DRIVER=0
|
||||
done
|
||||
if [ "$CONTAINERS_USE_BTRFS_DRIVER" != "0" ]; then
|
||||
@ -166,7 +164,11 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/containers/policy.json
|
||||
%config(noreplace) %{_sysconfdir}/containers/storage.conf
|
||||
%config(noreplace) %{_sysconfdir}/containers/mounts.conf
|
||||
/usr/etc/profile.d/libcontainers-common-storage.sh
|
||||
%if 0%{?suse_version} == 1500
|
||||
%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
|
||||
%else
|
||||
%{_prefix}%{_sysconfdir}/profile.d/libcontainers-common-storage.sh
|
||||
%endif
|
||||
%{_datadir}/containers/mounts.conf
|
||||
%config(noreplace) %{_sysconfdir}/containers/registries.conf
|
||||
%config(noreplace) %{_sysconfdir}/containers/seccomp.json
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5716533292bc584e49ce4220b4fcdb04b188b24ed53b7a862187e803870961b8
|
||||
size 6518292
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2cc219dbc1f01cf850d947b6262ee89a4a8ccd2b6f7967f905ed853fd6715405
|
||||
size 1813224
|
||||
3
storage-1.44.0.tar.xz
Normal file
3
storage-1.44.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d2b9051ba7e4243960bdeb821b8d1c9b79f78a49bfd1692ba8e0fb4004a6edc5
|
||||
size 1870312
|
||||
Loading…
Reference in New Issue
Block a user