1
0

Accepting request 886688 from devel:kubic

- Force overlay as default storage driver if system is not btrfs
  (gh#containers/buildah#3153) 

- Update common to 0.36.0
- Update podman to 3.1.1
- Update storage to 1.29.0
- Update image to 5.11.0

OBS-URL: https://build.opensuse.org/request/show/886688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2021-04-22 16:03:45 +00:00 committed by Git OBS Bridge
parent 96ee6bcb59
commit b07abca13d
12 changed files with 68 additions and 56 deletions

View File

@ -1,40 +1,38 @@
<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">1.28.1</param>
<param name="revision">v1.28.1</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">5.10.5</param>
<param name="revision">v5.10.5</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="versionformat">3.1.0</param>
<param name="revision">v3.1.0</param>
</service>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/containers/common.git</param>
<param name="scm">git</param>
<param name="filename">common</param>
<param name="versionformat">0.35.3</param>
<param name="revision">v0.35.3</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<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="revision">v1.29.0</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/image.git</param>
<param name="scm">git</param>
<param name="filename">image</param>
<param name="revision">v5.11.0</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.1.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/common.git</param>
<param name="scm">git</param>
<param name="filename">common</param>
<param name="revision">v0.36.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services>

View File

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

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

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

View File

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

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

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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Apr 19 12:21:56 UTC 2021 - Richard Brown <rbrown@suse.com>
- Force overlay as default storage driver if system is not btrfs
(gh#containers/buildah#3153)
-------------------------------------------------------------------
Mon Apr 19 11:03:30 UTC 2021 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
- Update common to 0.36.0
- Update podman to 3.1.1
- Update storage to 1.29.0
- Update image to 5.11.0
-------------------------------------------------------------------
Tue Mar 30 08:37:09 UTC 2021 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>

View File

@ -17,16 +17,16 @@
# commonver - version from containers/common
%define commonver 0.35.3
%define commonver 0.36.0
# podman - version from containers/podman
%define podmanver 3.1.0
%define podmanver 3.1.1
# storagever - version from containers/storage
%define storagever 1.28.1
%define storagever 1.29.0
# imagever - version from containers/image
%define imagever 5.10.5
%define imagever 5.11.0
Name: libcontainers-common
Version: 20210112
@ -138,7 +138,7 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma
if [ $1 -eq 1 ] ; then
fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE)
if [ "$fstype" = "btrfs" ]; then
sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
fi
fi

View File

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

3
podman-3.1.1.tar.xz Normal file
View File

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

View File

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

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

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

View File

@ -5,7 +5,7 @@
[storage]
# Default Storage Driver
driver = ""
driver = "overlay"
# Temporary storage location
runroot = "/var/run/containers/storage"