pool/docker
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1246830 from Virtualization:containers

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1246830
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=159
This commit is contained in:
Ana Guerrero 2025-02-20 15:27:07 +00:00 committed by Git OBS Bridge
commit efef872286
15 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
View File

@ -1,4 +1,4 @@
From 70a1e03d5572deb789c5c4d817257c0760b79869 Mon Sep 17 00:00:00 2001
From f839b3ae9ba6e379fc7141987bf423cd66e353e3 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Wed, 8 Mar 2017 12:41:54 +1100
Subject: [PATCH 1/5] SECRETS: daemon: allow directory creation in /run/secrets
@ -69,5 +69,5 @@ index f572e0d8a865..88573559d537 100644
return errors.Wrap(err, "error setting ownership for secret")
}
--
2.47.1
2.48.1

4
0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
View File

@ -1,4 +1,4 @@
From f1bfb09b1d53d6ddf68beedfce4e4110c2b10118 Mon Sep 17 00:00:00 2001
From 2dae295a69ce4cc345ec144abeb6ffd936fd639a Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Wed, 8 Mar 2017 11:43:29 +1100
Subject: [PATCH 2/5] SECRETS: SUSE: implement SUSE container secrets
@ -506,5 +506,5 @@ index 000000000000..85b37bf46544
+ return nil
+}
--
2.47.1
2.48.1

6
0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch
View File

@ -1,4 +1,4 @@
From 3613734aeb6eacd45e53dfd834f46dc006ba0047 Mon Sep 17 00:00:00 2001
From d3a0ce85a41282135e0eea96dd04a4c82effea1d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Mon, 22 May 2023 15:44:54 +1000
Subject: [PATCH 3/5] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
@ -16,7 +16,7 @@ Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index 61f22ed2dd49..330571e3c047 100644
index 73652ed853ba..c31e1c542253 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -4,17 +4,12 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
@ -42,5 +42,5 @@ index 61f22ed2dd49..330571e3c047 100644
static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) {
snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
--
2.47.1
2.48.1

4
0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
View File

@ -1,4 +1,4 @@
From e06f78e09fa03680ce51c8a080447fbc62156d3d Mon Sep 17 00:00:00 2001
From d14bce9bafde35ad958f38f608bf3e0481d98ad7 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Fri, 29 Jun 2018 17:59:30 +1000
Subject: [PATCH 4/5] bsc1073877: apparmor: clobber docker-default profile on
@ -85,5 +85,5 @@ index f152685e6026..dee4c33471d5 100644
}
--
2.47.1
2.48.1

4
0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
View File

@ -1,4 +1,4 @@
From 65799b8d19180cb039d257262bfa88e6629ccdf9 Mon Sep 17 00:00:00 2001
From 7a52b3d815482a14646e07319d5c0b7a59d1994d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Wed, 11 Oct 2023 21:19:12 +1100
Subject: [PATCH 5/5] SLE12: revert "apparmor: remove version-conditionals from
@ -322,5 +322,5 @@ index 8dbc1b610288..2062aab1ac99 100644
}
`
--
2.47.1
2.48.1

12
_service
View File

@ -3,24 +3,24 @@
<param name="url">https://github.com/moby/moby.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">27.4.1_ce_%h</param>
<param name="revision">v27.4.1</param>
<param name="versionformat">27.5.1_ce_%h</param>
<param name="revision">v27.5.1</param>
<param name="filename">docker</param>
</service>
<service name="tar_scm" mode="manual">
<param name="url">https://github.com/docker/cli.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">27.4.1_ce</param>
<param name="revision">v27.4.1</param>
<param name="versionformat">27.5.1_ce</param>
<param name="revision">v27.5.1</param>
<param name="filename">docker-cli</param>
</service>
<service name="tar_scm" mode="manual">
<param name="url">https://github.com/docker/buildx.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.19.3</param>
<param name="revision">v0.19.3</param>
<param name="versionformat">0.20.1</param>
<param name="revision">v0.20.1</param>
<param name="filename">docker-buildx</param>
</service>
<service name="recompress" mode="manual">

28
cli-0001-docs-include-required-tools-in-source-tree.patch
View File

@ -1,4 +1,4 @@
From 8fbd3c8cfba959ec3b0db555d10158745cd01456 Mon Sep 17 00:00:00 2001
From 72764aa64ffcebcebe20a46ffacd177f6b378336 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Mon, 16 Dec 2024 17:21:02 +1100
Subject: [PATCH] docs: include required tools in source tree
@ -337,7 +337,7 @@ index c4ed0d567de3..7da8d1a2fa95 100755
mkdir -p docs/yaml
set -x
diff --git a/vendor.mod b/vendor.mod
index e1e7975baebc..1ceb5d5c6fa2 100644
index eee224ca3e43..ae60187da312 100644
--- a/vendor.mod
+++ b/vendor.mod
@@ -9,6 +9,7 @@ go 1.22.0
@ -348,22 +348,22 @@ index e1e7975baebc..1ceb5d5c6fa2 100644
github.com/creack/pty v1.1.21
github.com/distribution/reference v0.6.0
github.com/docker/cli-docs-tool v0.8.0
@@ -87,6 +88,7 @@ require (
github.com/prometheus/common v0.44.0 // indirect
@@ -88,6 +89,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
@@ -102,4 +104,5 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.66.3 // indirect
google.golang.org/protobuf v1.35.1 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/vendor.sum b/vendor.sum
index 204aad33c6cb..7f450e74144e 100644
index cd64a4b400a4..dd7bd042e3d3 100644
--- a/vendor.sum
+++ b/vendor.sum
@@ -42,6 +42,7 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
@ -374,10 +374,10 @@ index 204aad33c6cb..7f450e74144e 100644
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
@@ -249,6 +250,7 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
@@ -251,6 +252,7 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@ -23179,7 +23179,7 @@ index 000000000000..e88f9c54aecb
+
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 9c7ffb832403..224253dd728a 100644
index 2a6c2df36893..61bda3f867e9 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -29,6 +29,10 @@ github.com/containerd/log
@ -23201,7 +23201,7 @@ index 9c7ffb832403..224253dd728a 100644
github.com/docker/cli-docs-tool/annotation
# github.com/docker/distribution v2.8.3+incompatible
## explicit
@@ -263,12 +268,16 @@ github.com/prometheus/procfs/internal/util
@@ -267,12 +272,16 @@ github.com/prometheus/procfs/internal/util
# github.com/rivo/uniseg v0.2.0
## explicit; go 1.12
github.com/rivo/uniseg
@ -23218,7 +23218,7 @@ index 9c7ffb832403..224253dd728a 100644
# github.com/spf13/pflag v1.0.5
## explicit; go 1.12
github.com/spf13/pflag
@@ -519,6 +528,9 @@ google.golang.org/protobuf/types/known/wrapperspb
@@ -527,6 +536,9 @@ google.golang.org/protobuf/types/known/wrapperspb
# gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2
@ -23229,5 +23229,5 @@ index 9c7ffb832403..224253dd728a 100644
## explicit; go 1.17
gotest.tools/v3/assert
--
2.47.1
2.48.1

3
docker-27.4.1_ce_c710b88579fc.tar.xz
View File

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

3
docker-27.5.1_ce_4c9b3b011ae4.tar.xz Normal file
View File

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

3
docker-buildx-0.19.3.tar.xz
View File

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

3
docker-buildx-0.20.1.tar.xz Normal file
View File

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

3
docker-cli-27.4.1_ce.tar.xz
View File

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

3
docker-cli-27.5.1_ce.tar.xz Normal file
View File

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

15
docker.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Feb 19 04:28:34 UTC 2025 - Aleksa Sarai <asarai@suse.com>
- Update to Docker 27.5.1-ce. See upstream changelog online at
<https://docs.docker.com/engine/release-notes/27/#2741> bsc#1237335
- Rebase patches:
* 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
* 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
* 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch
* 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
* 0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
* cli-0001-docs-include-required-tools-in-source-tree.patch
- Update to docker-buildx 0.20.1. See upstream changelog online at
<https://github.com/docker/buildx/releases/tag/v0.20.1>
-------------------------------------------------------------------
Wed Dec 18 12:29:07 UTC 2024 - Aleksa Sarai <asarai@suse.com>

8
docker.spec
View File

@ -51,8 +51,8 @@
%endif
# MANUAL: This needs to be updated with every docker update.
%define docker_real_version 27.4.1
%define docker_git_version c710b88579fc
%define docker_real_version 27.5.1
%define docker_git_version 4c9b3b011ae4
%define docker_version %{docker_real_version}_ce
# This "nice version" is so that docker --version gives a result that can be
# parsed by other people. boo#1182476
@ -60,7 +60,7 @@
%if %{with buildx}
# MANUAL: This needs to be updated with every docker-buildx update.
%define buildx_version 0.19.3
%define buildx_version 0.20.1
%endif
# Used when generating the "build" information for Docker version. The value of
@ -68,7 +68,7 @@
# 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_commit_epoch 1734439831
%define git_commit_epoch 1737503210
Name: docker%{flavour}
Version: %{docker_version}