forked from pool/docker
Accepting request 981101 from home:cyphar:docker
- Update to Docker 20.10.17-ce. See upstream changelog online at <https://docs.docker.com/engine/release-notes/#201017>. bsc#1200145 OBS-URL: https://build.opensuse.org/request/show/981101 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=370
This commit is contained in:
parent
5fb98d193e
commit
6fbaa2ec7d
10
_service
10
_service
@ -3,16 +3,16 @@
|
||||
<param name="url">https://github.com/moby/moby.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">20.10.14_ce_%h</param>
|
||||
<param name="revision">v20.10.14</param>
|
||||
<param name="versionformat">20.10.17_ce_%h</param>
|
||||
<param name="revision">v20.10.17</param>
|
||||
<param name="filename">docker</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/docker/cli.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">20.10.14_ce</param>
|
||||
<param name="revision">v20.10.14</param>
|
||||
<param name="versionformat">20.10.17_ce</param>
|
||||
<param name="revision">v20.10.17</param>
|
||||
<param name="filename">docker-cli</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
@ -20,7 +20,7 @@
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">%H</param>
|
||||
<param name="revision">64b7a4574d1426139437d20e81c0b6d391130ec8</param>
|
||||
<param name="revision">f6ccccb1c082a432c2a5814aaedaca56af33d9ea</param>
|
||||
<param name="filename">docker-libnetwork</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6d3e2a8f966b51320d8aaae83ac9606b5e042766ebdac3fde5fd36bb8579502d
|
||||
size 6424424
|
3
docker-20.10.17_ce_a89b84221c85.tar.xz
Normal file
3
docker-20.10.17_ce_a89b84221c85.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9464d19aa358c19089672a03b13572b9c512c8c19ad098b594caca864052c426
|
||||
size 6557740
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b1549d97c545ac15336032be381f02de480bc25d8090feadf43a23d91ab56110
|
||||
size 4265544
|
3
docker-cli-20.10.17_ce.tar.xz
Normal file
3
docker-cli-20.10.17_ce.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1eeb771ad69ec70e206d69bdb649d05f438d0fa4193bbb6f4c7fd276258a08a9
|
||||
size 4357440
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:437df6f6e33cf527acbcc2117738430f89e43bc57d958557155b3392c3a00ff8
|
||||
size 1983592
|
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a676901b2676dedd147e70b2e6c5b9869e8d2fad99605de20cc1b42830097d3b
|
||||
size 1983552
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 7 07:18:41 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
- Update to Docker 20.10.17-ce. See upstream changelog online at
|
||||
<https://docs.docker.com/engine/release-notes/#201017>. bsc#1200145
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 29 02:51:43 UTC 2022 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
|
18
docker.spec
18
docker.spec
@ -42,24 +42,24 @@
|
||||
# helpfully injects into our build environment from the changelog). If you want
|
||||
# to generate a new git_commit_epoch, use this:
|
||||
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
|
||||
%define git_version 87a90dc786bd
|
||||
%define git_commit_epoch 1649909084
|
||||
%define git_version a89b84221c85
|
||||
%define git_commit_epoch 1654554758
|
||||
|
||||
# We require a specific pin of libnetwork because it doesn't really do
|
||||
# versioning and minor version mismatches in libnetwork can break Docker
|
||||
# networking. All other key runtime dependencies (containerd, runc) are stable
|
||||
# enough that this isn't necessary.
|
||||
%define libnetwork_version 64b7a4574d1426139437d20e81c0b6d391130ec8
|
||||
%define libnetwork_version f6ccccb1c082a432c2a5814aaedaca56af33d9ea
|
||||
|
||||
%define dist_builddir %{_builddir}/dist-suse
|
||||
%define cli_builddir %{dist_builddir}/src/github.com/docker/cli
|
||||
%define proxy_builddir %{dist_builddir}/src/github.com/docker/libnetwork
|
||||
|
||||
Name: %{realname}%{name_suffix}
|
||||
Version: 20.10.14_ce
|
||||
Version: 20.10.17_ce
|
||||
# This "nice version" is so that docker --version gives a result that can be
|
||||
# parsed by other people. boo#1182476
|
||||
%define nice_version 20.10.14-ce
|
||||
%define nice_version 20.10.17-ce
|
||||
Release: 0
|
||||
Summary: The Moby-project Linux container runtime
|
||||
License: Apache-2.0
|
||||
@ -111,8 +111,10 @@ BuildRequires: sqlite3-devel
|
||||
BuildRequires: zsh
|
||||
BuildRequires: fish
|
||||
BuildRequires: go-go-md2man
|
||||
BuildRequires: go1.16
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
|
||||
# for 'golang(API) >= 1.17' here, so just require 1.17 exactly. bsc#1172608
|
||||
BuildRequires: go1.17
|
||||
Requires: apparmor-parser
|
||||
Requires: ca-certificates-mozilla
|
||||
# The docker-proxy binary used to be in a separate package. We obsolete it,
|
||||
@ -121,8 +123,8 @@ Obsoletes: docker-libnetwork%{name_suffix} < 0.7.0.2
|
||||
Provides: docker-libnetwork%{name_suffix} = 0.7.0.2.%{version}
|
||||
# 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.
|
||||
Requires: runc >= 1.0.2
|
||||
Requires: containerd >= 1.5
|
||||
Requires: runc >= 1.1.2
|
||||
Requires: containerd >= 1.6.6
|
||||
# Needed for --init support. We don't use "tini", we use our own implementation
|
||||
# which handles edge-cases better.
|
||||
Requires: catatonit
|
||||
|
Loading…
Reference in New Issue
Block a user