Accepting request 970023 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/970023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger 2022-04-15 22:13:02 +00:00 committed by Git OBS Bridge
commit 0453951150
7 changed files with 22 additions and 15 deletions

View File

@ -3,16 +3,16 @@
<param name="url">https://github.com/moby/moby.git</param> <param name="url">https://github.com/moby/moby.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="versionformat">20.10.12_ce_%h</param> <param name="versionformat">20.10.14_ce_%h</param>
<param name="revision">v20.10.12</param> <param name="revision">v20.10.14</param>
<param name="filename">docker</param> <param name="filename">docker</param>
</service> </service>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="url">https://github.com/docker/cli.git</param> <param name="url">https://github.com/docker/cli.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="versionformat">20.10.12_ce</param> <param name="versionformat">20.10.14_ce</param>
<param name="revision">v20.10.12</param> <param name="revision">v20.10.14</param>
<param name="filename">docker-cli</param> <param name="filename">docker-cli</param>
</service> </service>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 14 04:09:58 UTC 2022 - Aleksa Sarai <asarai@suse.com>
- Update to Docker 20.10.14-ce. See upstream changelog online at
<https://docs.docker.com/engine/release-notes/#201014>. bsc#1197517
CVE-2022-24769
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 17 07:23:01 UTC 2022 - Aleksa Sarai <asarai@suse.com> Mon Jan 17 07:23:01 UTC 2022 - Aleksa Sarai <asarai@suse.com>

View File

@ -42,8 +42,8 @@
# helpfully injects into our build environment from the changelog). If you want # helpfully injects into our build environment from the changelog). If you want
# to generate a new git_commit_epoch, use this: # to generate a new git_commit_epoch, use this:
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
%define git_version 459d0dfbbb51 %define git_version 87a90dc786bd
%define git_commit_epoch 1639303911 %define git_commit_epoch 1649909084
# We require a specific pin of libnetwork because it doesn't really do # We require a specific pin of libnetwork because it doesn't really do
# versioning and minor version mismatches in libnetwork can break Docker # versioning and minor version mismatches in libnetwork can break Docker
@ -56,10 +56,10 @@
%define proxy_builddir %{dist_builddir}/src/github.com/docker/libnetwork %define proxy_builddir %{dist_builddir}/src/github.com/docker/libnetwork
Name: %{realname}%{name_suffix} Name: %{realname}%{name_suffix}
Version: 20.10.12_ce Version: 20.10.14_ce
# This "nice version" is so that docker --version gives a result that can be # This "nice version" is so that docker --version gives a result that can be
# parsed by other people. boo#1182476 # parsed by other people. boo#1182476
%define nice_version 20.10.12-ce %define nice_version 20.10.14-ce
Release: 0 Release: 0
Summary: The Moby-project Linux container runtime Summary: The Moby-project Linux container runtime
License: Apache-2.0 License: Apache-2.0
@ -119,7 +119,7 @@ Provides: docker-libnetwork%{name_suffix} = 0.7.0.2.%{version}
# Required to actually run containers. We require the minimum version that is # Required to actually run containers. We require the minimum version that is
# pinned by Docker, but in order to avoid headaches we allow for updates. # pinned by Docker, but in order to avoid headaches we allow for updates.
Requires: runc >= 1.0.2 Requires: runc >= 1.0.2
Requires: containerd >= 1.4.12 Requires: containerd >= 1.5
# Needed for --init support. We don't use "tini", we use our own implementation # Needed for --init support. We don't use "tini", we use our own implementation
# which handles edge-cases better. # which handles edge-cases better.
Requires: catatonit Requires: catatonit