Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2025-06-26 14:05:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.7067 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Thu Jun 26 14:05:40 2025 rev:166 rq:1288579 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2025-06-24 20:46:42.558236003 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.7067/docker.changes 2025-06-26 14:06:18.008317237 +0200 @@ -1,0 +2,13 @@ +Wed Jun 25 15:33:36 UTC 2025 - Aleksa Sarai <asa...@suse.com> + +- Update to Docker 28.3.0-ce. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/28/#2830> +- Rebase patches: + * 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch + * 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch + * 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch + * 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch + * 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch + * 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch + +------------------------------------------------------------------- @@ -109 +122 @@ - <https://github.com/moby/moby/releases/tag/v28.2.2> + <https://docs.docker.com/engine/release-notes/28/#2822> Old: ---- docker-28.2.2_ce_45873be4a.tar.xz docker-cli-28.2.2_ce.tar.xz New: ---- docker-28.3.0_ce_265f70964.tar.xz docker-cli-28.3.0_ce.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.832351395 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.832351395 +0200 @@ -51,8 +51,8 @@ %endif # MANUAL: This needs to be updated with every docker update. -%define docker_real_version 28.2.2 -%define docker_git_version 45873be4a +%define docker_real_version 28.3.0 +%define docker_git_version 265f70964 %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 1748595239 +%define git_commit_epoch 1750436555 Name: docker%{flavour} Version: %{docker_version} ++++++ 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.856352390 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.856352390 +0200 @@ -1,4 +1,4 @@ -From bfb35c39bf2986cda6db212c6a8577ac16836d43 Mon Sep 17 00:00:00 2001 +From 6984023c043bec71b44665a55ab4abec6f549ed5 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <cyp...@cyphar.com> Date: Wed, 4 Jun 2025 15:01:37 +1000 Subject: [PATCH 1/6] SECRETS: SUSE: always clear our internal secrets @@ -31,7 +31,7 @@ create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go -index fafb1ac2a342..eedb5ddc8a00 100644 +index a914a0fe3145..0930ff91d1a2 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -146,6 +146,16 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore @@ -102,6 +102,6 @@ + c.SecretReferences = without +} -- -2.49.0 +2.50.0 ++++++ 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.884353551 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.896354048 +0200 @@ -1,4 +1,4 @@ -From 29f983aa7b15ccf0a942008820069efc0741f623 Mon Sep 17 00:00:00 2001 +From a37bdf794549f1bd238d222801f87c223efc92dc Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 2/6] SECRETS: daemon: allow directory creation in /run/secrets @@ -14,11 +14,11 @@ 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go -index 4316cc4a1157..2309d589ae9e 100644 +index f6d9449609b7..520b7f80f162 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -3,6 +3,7 @@ - package daemon // import "github.com/docker/docker/daemon" + package daemon import ( + "bytes" @@ -69,6 +69,6 @@ return errors.Wrap(err, "error setting ownership for secret") } -- -2.49.0 +2.50.0 ++++++ 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.912354711 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.916354877 +0200 @@ -1,4 +1,4 @@ -From 787e602882fb4e4ad1efd88b3e902efbccbe69bd Mon Sep 17 00:00:00 2001 +From b2580007548917ca214a8f40f6888a3285c63b1f Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 3/6] SECRETS: SUSE: implement SUSE container secrets @@ -22,7 +22,7 @@ 2 files changed, 443 insertions(+) diff --git a/daemon/start.go b/daemon/start.go -index eedb5ddc8a00..db878c8d5ad1 100644 +index 0930ff91d1a2..02d2f8429c19 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -156,6 +156,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore ++++++ 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.936355707 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.940355872 +0200 @@ -1,4 +1,4 @@ -From cd450eac4d1713b723f13dd76d1f0fff79249ab2 Mon Sep 17 00:00:00 2001 +From faaf452a0ced139a10a76cdb4dba04ba39d2e948 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Mon, 22 May 2023 15:44:54 +1000 Subject: [PATCH 4/6] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI @@ -16,10 +16,10 @@ 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go -index 6f8ec970316b..4541abdfaf46 100644 +index fa0cb3ed25d8..871f6b3f8c1f 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" +@@ -4,17 +4,12 @@ package btrfs /* #include <stdlib.h> @@ -42,6 +42,6 @@ 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.49.0 +2.50.0 ++++++ 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.956356535 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.960356701 +0200 @@ -1,4 +1,4 @@ -From bf5cb37413b1415c0429d758a83bb0a7e592528e Mon Sep 17 00:00:00 2001 +From 1d73fe8e91b3f27e93affe5e8257b79627587875 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Fri, 29 Jun 2018 17:59:30 +1000 Subject: [PATCH 5/6] bsc1073877: apparmor: clobber docker-default profile on @@ -22,7 +22,7 @@ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go -index 5a3121d05b5a..d63799b4e113 100644 +index d5737e5a75a3..d77c714d266b 100644 --- a/daemon/apparmor_default.go +++ b/daemon/apparmor_default.go @@ -23,6 +23,15 @@ func DefaultApparmorProfile() string { @@ -54,12 +54,12 @@ return nil } diff --git a/daemon/apparmor_default_unsupported.go b/daemon/apparmor_default_unsupported.go -index be4938f5b61a..2b326fea5829 100644 +index 37974bbb9778..095aa728a7a8 100644 --- a/daemon/apparmor_default_unsupported.go +++ b/daemon/apparmor_default_unsupported.go @@ -2,6 +2,10 @@ - package daemon // import "github.com/docker/docker/daemon" + package daemon +func clobberDefaultAppArmorProfile() error { + return nil @@ -69,10 +69,10 @@ return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go -index 388e3c1c2dbf..6741ab6b4991 100644 +index 2e0a36eb102b..f28c6e061fa9 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go -@@ -875,8 +875,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S +@@ -878,8 +878,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S log.G(ctx).Warnf("Failed to configure golang's threads limit: %v", err) } @@ -85,6 +85,6 @@ } -- -2.49.0 +2.50.0 ++++++ 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:18.976357364 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:18.988357862 +0200 @@ -1,4 +1,4 @@ -From fd5b328e86bf14107f1a73325dc3bb4e12c5980f Mon Sep 17 00:00:00 2001 +From 993356d0603739961b62a8010d96f412e56b9196 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 11 Oct 2023 21:19:12 +1100 Subject: [PATCH 6/6] SLE12: revert "apparmor: remove version-conditionals from @@ -322,6 +322,6 @@ } ` -- -2.49.0 +2.50.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dz9Nmw/_old 2025-06-26 14:06:19.044360184 +0200 +++ /var/tmp/diff_new_pack.dz9Nmw/_new 2025-06-26 14:06:19.048360349 +0200 @@ -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">28.2.2_ce_%h</param> - <param name="revision">v28.2.2</param> + <param name="versionformat">28.3.0_ce_%h</param> + <param name="revision">v28.3.0</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">28.2.2_ce</param> - <param name="revision">v28.2.2</param> + <param name="versionformat">28.3.0_ce</param> + <param name="revision">v28.3.0</param> <param name="filename">docker-cli</param> </service> <service name="tar_scm" mode="manual"> ++++++ docker-28.2.2_ce_45873be4a.tar.xz -> docker-28.3.0_ce_265f70964.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-28.2.2_ce_45873be4a.tar.xz /work/SRC/openSUSE:Factory/.docker.new.7067/docker-28.3.0_ce_265f70964.tar.xz differ: char 15, line 1 ++++++ docker-cli-28.2.2_ce.tar.xz -> docker-cli-28.3.0_ce.tar.xz ++++++ ++++ 29470 lines of diff (skipped)
