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

- Update to Docker 27.4.1-ce. See upstream changelog online at

Browse Source 
<https://docs.docker.com/engine/release-notes/27/#2741>
- 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

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=425
This commit is contained in:
Aleksa Sarai 2024-12-18 13:03:50 +00:00 committed by Git OBS Bridge
parent d69d01a8db
commit 22827cbc1b
13 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e61934d55312f3c59e2f7900386a76601abaab9e Mon Sep 17 00:00:00 2001
From 70a1e03d5572deb789c5c4d817257c0760b79869 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

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

@ -1,4 +1,4 @@
From 817e18ec54327e35fb619b7f1735a7345bb43982 Mon Sep 17 00:00:00 2001
From f1bfb09b1d53d6ddf68beedfce4e4110c2b10118 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

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

@ -1,4 +1,4 @@
From cc60ef01f9bf1bb5b2a93b1fa26a8159df6501e3 Mon Sep 17 00:00:00 2001
From 3613734aeb6eacd45e53dfd834f46dc006ba0047 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

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

@ -1,4 +1,4 @@
From 57c5ded48d5f3d8ac3653061f47aca8a23814e11 Mon Sep 17 00:00:00 2001
From e06f78e09fa03680ce51c8a080447fbc62156d3d 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

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

@ -1,4 +1,4 @@
From 168707113fddad00f06381f56dcdcc2c0d0448d6 Mon Sep 17 00:00:00 2001
From 65799b8d19180cb039d257262bfa88e6629ccdf9 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

8
_service
View File

@ -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">27.4.0_ce_%h</param>
<param name="revision">v27.4.0</param>
<param name="versionformat">27.4.1_ce_%h</param>
<param name="revision">v27.4.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.0_ce</param>
<param name="revision">v27.4.0</param>
<param name="versionformat">27.4.1_ce</param>
<param name="revision">v27.4.1</param>
<param name="filename">docker-cli</param>
</service>
<service name="tar_scm" mode="manual">

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

@ -1,4 +1,4 @@
From 5e7c87f386a6cf973270ce94f7935a9ccd59eb93 Mon Sep 17 00:00:00 2001
From 8fbd3c8cfba959ec3b0db555d10158745cd01456 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
@ -178,7 +178,7 @@ index 47510bc49a89..000000000000
-)
diff --git a/man/go.mod b/man/go.mod
deleted file mode 100644
index 238ac1ef4116..000000000000
index 1bb09dabf10a..000000000000
--- a/man/go.mod
+++ /dev/null
@@ -1,15 +0,0 @@
@ -191,7 +191,7 @@ index 238ac1ef4116..000000000000
-
-//require (
-// github.com/docker/cli v0.0.0+incompatible
-// github.com/cpuguy83/go-md2man/v2 v2.0.4
-// github.com/cpuguy83/go-md2man/v2 v2.0.5
-// github.com/spf13/cobra v1.2.1
-// github.com/spf13/pflag v1.0.5
-//)
@ -210,12 +210,12 @@ index 3cafe6533aff..3998dc709072 100644
- _ "github.com/spf13/pflag"
)
diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh
index 47ebcedb8552..4b1e4b9dfe86 100755
index 711041b6d399..15d0cf85b185 100755
--- a/scripts/docs/generate-man.sh
+++ b/scripts/docs/generate-man.sh
@@ -4,32 +4,18 @@ set -eu
: "${MD2MAN_VERSION=v2.0.4}"
: "${MD2MAN_VERSION=v2.0.5}"
-export GO111MODULE=auto
-
@ -337,7 +337,7 @@ index c4ed0d567de3..7da8d1a2fa95 100755
mkdir -p docs/yaml
set -x
diff --git a/vendor.mod b/vendor.mod
index 232eadeda214..51fd342183bd 100644
index e1e7975baebc..1ceb5d5c6fa2 100644
--- a/vendor.mod
+++ b/vendor.mod
@@ -9,6 +9,7 @@ go 1.22.0
@ -363,7 +363,7 @@ index 232eadeda214..51fd342183bd 100644
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/vendor.sum b/vendor.sum
index 50228dae0dd5..99025180244f 100644
index 204aad33c6cb..7f450e74144e 100644
--- a/vendor.sum
+++ b/vendor.sum
@@ -42,6 +42,7 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
@ -23179,7 +23179,7 @@ index 000000000000..e88f9c54aecb
+
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3e9061a71fd8..5e3df76cc13a 100644
index 9c7ffb832403..224253dd728a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -29,6 +29,10 @@ github.com/containerd/log

3
docker-27.4.0_ce_92a83937d028.tar.xz
View File

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

3
docker-27.4.1_ce_c710b88579fc.tar.xz Normal file
View File

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

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

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

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

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

13
docker.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 18 12:29:07 UTC 2024 - Aleksa Sarai <asarai@suse.com>
- Update to Docker 27.4.1-ce. See upstream changelog online at
<https://docs.docker.com/engine/release-notes/27/#2741>
- 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
-------------------------------------------------------------------
Tue Dec 17 13:20:39 UTC 2024 - Aleksa Sarai <asarai@suse.com>

6
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.0
%define docker_git_version 92a83937d028
%define docker_real_version 27.4.1
%define docker_git_version c710b88579fc
%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
@ -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 1721763388
%define git_commit_epoch 1734439831
Name: docker%{flavour}
Version: %{docker_version}