From 8bf4339d2272fc372a361c251474ef0ca4147cfea1c482db648d1373b10afcee Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 27 Apr 2023 14:16:11 +0000 Subject: [PATCH] Accepting request 1083274 from home:cyphar:docker - Update to Docker 23.0.5-ce. See upstream changelog online at . - Rebase patches: * cli-0001-docs-include-required-tools-in-source-tree.patch OBS-URL: https://build.opensuse.org/request/show/1083274 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=385 --- _service | 8 ++++---- ...01-docs-include-required-tools-in-source-tree.patch | 10 +++++----- docker-23.0.4_ce_cbce3319305c.tar.xz | 3 --- docker-23.0.5_ce_94d3ad69cc59.tar.xz | 3 +++ docker-cli-23.0.4_ce.tar.xz | 3 --- docker-cli-23.0.5_ce.tar.xz | 3 +++ docker.changes | 8 ++++++++ docker.spec | 6 +++--- 8 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 docker-23.0.4_ce_cbce3319305c.tar.xz create mode 100644 docker-23.0.5_ce_94d3ad69cc59.tar.xz delete mode 100644 docker-cli-23.0.4_ce.tar.xz create mode 100644 docker-cli-23.0.5_ce.tar.xz diff --git a/_service b/_service index a24aa5a..d3b3a76 100644 --- a/_service +++ b/_service @@ -3,16 +3,16 @@ https://github.com/moby/moby.git git .git - 23.0.4_ce_%h - v23.0.4 + 23.0.5_ce_%h + v23.0.5 docker https://github.com/docker/cli.git git .git - 23.0.4_ce - v23.0.4 + 23.0.5_ce + v23.0.5 docker-cli diff --git a/cli-0001-docs-include-required-tools-in-source-tree.patch b/cli-0001-docs-include-required-tools-in-source-tree.patch index ee3dd39..edfa78c 100644 --- a/cli-0001-docs-include-required-tools-in-source-tree.patch +++ b/cli-0001-docs-include-required-tools-in-source-tree.patch @@ -1,4 +1,4 @@ -From bab803a45a55cfd413f930d50c518c24da80128a Mon Sep 17 00:00:00 2001 +From 0c35d956eb289bd6186e2865a779d2615c471b94 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 26 Apr 2023 10:13:48 +1000 Subject: [PATCH] docs: include required tools in source tree @@ -381,7 +381,7 @@ index 4d0006e43e79..3f3f7df8b140 100755 mkdir -p docs/yaml set -x diff --git a/vendor.mod b/vendor.mod -index e710b3474474..1a6170161e32 100644 +index da1d033bff0b..61034043c05e 100644 --- a/vendor.mod +++ b/vendor.mod @@ -8,7 +8,9 @@ go 1.18 @@ -392,7 +392,7 @@ index e710b3474474..1a6170161e32 100644 github.com/creack/pty v1.1.11 + github.com/docker/cli-docs-tool v0.5.1 github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v23.0.3+incompatible + github.com/docker/docker v23.0.4+incompatible github.com/docker/docker-credential-helpers v0.7.0 @@ -67,6 +69,7 @@ require ( github.com/prometheus/common v0.37.0 // indirect @@ -409,7 +409,7 @@ index e710b3474474..1a6170161e32 100644 + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/vendor.sum b/vendor.sum -index c4db8107b267..6cb3f9830c0f 100644 +index 91aae7c1487c..ad0005735231 100644 --- a/vendor.sum +++ b/vendor.sum @@ -89,6 +89,7 @@ github.com/containerd/containerd v1.6.19/go.mod h1:HZCDMn4v/Xl2579/MvtOC2M206i+J @@ -23703,7 +23703,7 @@ index 000000000000..e88f9c54aecb + +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 66cea78f8854..12937b54c176 100644 +index 520bc4ca95e0..e744937180df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -18,9 +18,17 @@ github.com/containerd/containerd/errdefs diff --git a/docker-23.0.4_ce_cbce3319305c.tar.xz b/docker-23.0.4_ce_cbce3319305c.tar.xz deleted file mode 100644 index 33789f3..0000000 --- a/docker-23.0.4_ce_cbce3319305c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a4b5308b55bf785e97acf5dca70866a362b71b8d314ce4762fb0bc7be59d611 -size 8261820 diff --git a/docker-23.0.5_ce_94d3ad69cc59.tar.xz b/docker-23.0.5_ce_94d3ad69cc59.tar.xz new file mode 100644 index 0000000..d5ef907 --- /dev/null +++ b/docker-23.0.5_ce_94d3ad69cc59.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84d3a48cfbeeece15ad367eb03834a97b0c57d195d889e5191c138cd6e06579a +size 8262024 diff --git a/docker-cli-23.0.4_ce.tar.xz b/docker-cli-23.0.4_ce.tar.xz deleted file mode 100644 index 5450fd1..0000000 --- a/docker-cli-23.0.4_ce.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d870ff012fbf1abc1dd7d01188894940ad7a9fc1d829ebb95377b298f1cbee7 -size 3497948 diff --git a/docker-cli-23.0.5_ce.tar.xz b/docker-cli-23.0.5_ce.tar.xz new file mode 100644 index 0000000..8ab54dd --- /dev/null +++ b/docker-cli-23.0.5_ce.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b93219b6b5c781031c1ed35fb3174c59e3572e3437218ca3646361259acb77e8 +size 3498104 diff --git a/docker.changes b/docker.changes index 69d919c..1327910 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 27 14:09:05 UTC 2023 - Aleksa Sarai + +- Update to Docker 23.0.5-ce. See upstream changelog online at + . +- Rebase patches: + * cli-0001-docs-include-required-tools-in-source-tree.patch + ------------------------------------------------------------------- Wed Apr 26 00:31:54 UTC 2023 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index e1e58c7..7ba190e 100644 --- a/docker.spec +++ b/docker.spec @@ -31,9 +31,9 @@ # 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 real_version 23.0.4 -%define git_version cbce3319305c -%define git_commit_epoch 1681433958 +%define real_version 23.0.5 +%define git_version 94d3ad69cc59 +%define git_commit_epoch 1682522945 Name: docker Version: %{real_version}_ce