Accepting request 1120880 from Virtualization:containers

- Update to Docker 24.0.7-ce. See upstream changelong online at
  <https://docs.docker.com/engine/release-notes/24.0/#2407>.
- 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/request/show/1120880
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=140

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

@@ -1,4 +1,4 @@
-From 2dedd52de834525fa533aba7854b91fdc783d821 Mon Sep 17 00:00:00 2001
+From abdf99298d04ab089ff084669ea421adc0e43f69 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

0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch

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

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

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

0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch

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

0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch

@@ -1,4 +1,4 @@
-From 69790a375a38aca33a81c9b88aece9a0efd79726 Mon Sep 17 00:00:00 2001
+From eef724b45a4047b6d3cefb214e330a4b24ccdf2e 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
@@ -208,7 +208,7 @@ index d0f236160506..b3566b2f7354 100644
  }
  
 diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
-index 5dcf35bf45c7..ed5892a7f6bd 100644
+index 9f207e2014a8..626e5f6789a3 100644
 --- a/profiles/apparmor/template.go
 +++ b/profiles/apparmor/template.go
 @@ -24,12 +24,14 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
@@ -226,8 +226,8 @@ index 5dcf35bf45c7..ed5892a7f6bd 100644
  
    deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a subdir)
    # deny write to files not in /proc/<number>/** or /proc/sys/**
-@@ -49,7 +51,9 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
+@@ -50,7 +52,9 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
-   deny /sys/firmware/** rwklx,
+   deny /sys/devices/virtual/powercap/** rwklx,
    deny /sys/kernel/security/** rwklx,
  
 +{{if ge .Version 208095}}

_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">24.0.6_ce_%h</param>
+    <param name="versionformat">24.0.7_ce_%h</param>
-    <param name="revision">v24.0.6</param>
+    <param name="revision">v24.0.7</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">24.0.6_ce</param>
+    <param name="versionformat">24.0.7_ce</param>
-    <param name="revision">v24.0.6</param>
+    <param name="revision">v24.0.7</param>
     <param name="filename">docker-cli</param>
   </service>
   <service name="recompress" mode="manual">

docker-24.0.6_ce_1a7969545d73.tar.xz

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

docker-cli-24.0.6_ce.tar.xz

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

docker.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Oct 27 21:14:37 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 24.0.7-ce. See upstream changelong online at
+  <https://docs.docker.com/engine/release-notes/24.0/#2407>.
+- 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
+
 -------------------------------------------------------------------
 Wed Oct 11 10:32:43 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 

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 24.0.6
+%define real_version 24.0.7
-%define git_version 1a7969545d73
+%define git_version 311b9ff0aa93
-%define git_commit_epoch 1693336457
+%define git_commit_epoch 1698306665
 
 Name:           docker
 Version:        %{real_version}_ce