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-10-11 22:48:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.5300 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Sat Oct 11 22:48:31 2025 rev:180 rq:1310597 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2025-10-04 18:51:23.374127293 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.5300/docker.changes 2025-10-11 22:49:04.890353856 +0200 @@ -1,0 +2,17 @@ +Wed Oct 8 16:45:29 UTC 2025 - Aleksa Sarai <[email protected]> + +- Update to Docker 28.5.1-ce. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/28/#2851> +- Rebased 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 + * cli-0001-openSUSE-point-users-to-docker-buildx-package.patch + * cli-0002-SECRETS-SUSE-default-to-DOCKER_BUILDKIT-0-for-docker.patch +- Remove upstreamed patch: + - 0007-Add-back-vendor.sum.patch + +------------------------------------------------------------------- Old: ---- 0007-Add-back-vendor.sum.patch docker-28.5.0_ce_cd048300a.tar.xz docker-cli-28.5.0_ce.tar.xz New: ---- docker-28.5.1_ce_f8215cc26.tar.xz docker-cli-28.5.1_ce.tar.xz ----------(Old B)---------- Old:- Remove upstreamed patch: - 0007-Add-back-vendor.sum.patch ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.822392785 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.826392953 +0200 @@ -53,8 +53,8 @@ %endif # MANUAL: This needs to be updated with every docker update. -%define docker_real_version 28.5.0 -%define docker_git_version cd048300a +%define docker_real_version 28.5.1 +%define docker_git_version f8215cc26 %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 @@ -70,7 +70,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 1759332378 +%define git_commit_epoch 1759890872 Name: docker%{flavour} Version: %{docker_version} @@ -109,8 +109,6 @@ Patch201: 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch # UPSTREAM: Revert of upstream patches to make apparmor work on SLE 12. Patch202: 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch -# UPSTREAM: Backport of <https://github.com/moby/moby/pull/51091>. (Fixes build.) -Patch203: 0007-Add-back-vendor.sum.patch BuildRequires: audit BuildRequires: bash-completion BuildRequires: ca-certificates @@ -372,8 +370,6 @@ %patch -P201 -p1 # Solves apparmor issues on SLE-12, but okay for newer SLE versions too. %patch -P202 -p1 -# Fixes broken vendor.sum for Docker v28.5.0 release. -%patch -P203 -p1 %build %sysusers_generate_pre %{SOURCE160} %{name} docker.conf ++++++ 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.850393955 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.854394123 +0200 @@ -1,7 +1,7 @@ -From 1af17ec1f487daa8e4957b75eba2ed2c149c7862 Mon Sep 17 00:00:00 2001 +From 8d12a0ed33fc4e099c59b4d977b2ce18cdc600e1 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 4 Jun 2025 15:01:37 +1000 -Subject: [PATCH 1/7] SECRETS: SUSE: always clear our internal secrets +Subject: [PATCH 1/6] SECRETS: SUSE: always clear our internal secrets In the future SUSEConnect support patch, we will add swarm secrets with the ID suse_* containing credentials pertinent to SUSEConnect. ++++++ 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.870394790 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.878395125 +0200 @@ -1,7 +1,7 @@ -From 0b12bef32adc4ccc3a906f80bbbcc5d8e03d533d Mon Sep 17 00:00:00 2001 +From c12e6960ee87d7944001e22f0ce3ada72a6a9cea Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 12:41:54 +1100 -Subject: [PATCH 2/7] SECRETS: daemon: allow directory creation in /run/secrets +Subject: [PATCH 2/6] SECRETS: daemon: allow directory creation in /run/secrets Since FileMode can have the directory bit set, allow a SecretStore implementation to return secrets that are actually directories. This is ++++++ 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.894395793 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.902396127 +0200 @@ -1,7 +1,7 @@ -From ba960c87d4595674f9a1bfbc5f3aaeb9da268b2f Mon Sep 17 00:00:00 2001 +From 915d237a25cc9639de24ad3e36f3d299be137e8a Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 11:43:29 +1100 -Subject: [PATCH 3/7] SECRETS: SUSE: implement SUSE container secrets +Subject: [PATCH 3/6] SECRETS: SUSE: implement SUSE container secrets This allows for us to pass in host credentials to a container, allowing for SUSEConnect to work with containers. ++++++ 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.918396796 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.922396962 +0200 @@ -1,7 +1,7 @@ -From 51ffea9de90cb770928ae89007911a0e9a7c8a95 Mon Sep 17 00:00:00 2001 +From c078332b3a52f0e220fd19f476c30dee50f7c1e3 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Mon, 22 May 2023 15:44:54 +1000 -Subject: [PATCH 4/7] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI +Subject: [PATCH 4/6] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI headers" This reverts commit 3208dcabdc8997340b255f5b880fef4e3f54580d. ++++++ 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.938397631 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.942397798 +0200 @@ -1,7 +1,7 @@ -From ff0dca0e669666805666beaf125a31f783e6859e Mon Sep 17 00:00:00 2001 +From e9aff2856f7b827ebb6964b5fd33fc51e2b6f0ec Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Fri, 29 Jun 2018 17:59:30 +1000 -Subject: [PATCH 5/7] bsc1073877: apparmor: clobber docker-default profile on +Subject: [PATCH 5/6] bsc1073877: apparmor: clobber docker-default profile on start In the process of making docker-default reloading far less expensive, ++++++ 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:05.954398300 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:05.962398633 +0200 @@ -1,7 +1,7 @@ -From 4146485db36718c4b0b8e7e859899d12be3a2eb4 Mon Sep 17 00:00:00 2001 +From d4db647a40c0c8992dc2eeb862e8bafaff58cca3 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 11 Oct 2023 21:19:12 +1100 -Subject: [PATCH 6/7] SLE12: revert "apparmor: remove version-conditionals from +Subject: [PATCH 6/6] SLE12: revert "apparmor: remove version-conditionals from template" This reverts the following commits: ++++++ _service ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:06.026401307 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:06.030401474 +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.5.0_ce_%h</param> - <param name="revision">v28.5.0</param> + <param name="versionformat">28.5.1_ce_%h</param> + <param name="revision">v28.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">28.5.0_ce</param> - <param name="revision">v28.5.0</param> + <param name="versionformat">28.5.1_ce</param> + <param name="revision">v28.5.1</param> <param name="filename">docker-cli</param> </service> <service name="tar_scm" mode="manual"> ++++++ cli-0001-openSUSE-point-users-to-docker-buildx-package.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:06.050402309 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:06.054402477 +0200 @@ -1,4 +1,4 @@ -From 67e10a02a86ad3bf3456a774d825a1873cec359e Mon Sep 17 00:00:00 2001 +From d5cf64f9cb8b5382a4f87700a80a0bc2c8d3185e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Mon, 1 Sep 2025 16:05:24 +1000 Subject: [PATCH 1/2] openSUSE: point users to docker-buildx package ++++++ cli-0002-SECRETS-SUSE-default-to-DOCKER_BUILDKIT-0-for-docker.patch ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:06.070403145 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:06.070403145 +0200 @@ -1,4 +1,4 @@ -From 97d7460419b5dbb2b219c9538b9ac99caf97a287 Mon Sep 17 00:00:00 2001 +From fbc4c8b4ac9f5ba5604fb2987fe53648fc63a009 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Fri, 15 Aug 2025 19:55:53 +1000 Subject: [PATCH 2/2] SECRETS: SUSE: default to DOCKER_BUILDKIT=0 for "docker ++++++ docker-28.5.0_ce_cd048300a.tar.xz -> docker-28.5.1_ce_f8215cc26.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-28.5.0_ce_cd048300a.tar.xz /work/SRC/openSUSE:Factory/.docker.new.5300/docker-28.5.1_ce_f8215cc26.tar.xz differ: char 15, line 1 ++++++ docker-cli-28.5.0_ce.tar.xz -> docker-cli-28.5.1_ce.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/.golangci.yml new/docker-cli-28.5.1_ce/.golangci.yml --- old/docker-cli-28.5.0_ce/.golangci.yml 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/.golangci.yml 2025-10-08 04:50:32.000000000 +0200 @@ -5,7 +5,7 @@ # which causes it to fallback to go1.17 semantics. # # TODO(thaJeztah): update "usetesting" settings to enable go1.24 features once our minimum version is go1.24 - go: "1.24.7" + go: "1.24.8" timeout: 5m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/Dockerfile new/docker-cli-28.5.1_ce/Dockerfile --- old/docker-cli-28.5.0_ce/Dockerfile 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/Dockerfile 2025-10-08 04:50:32.000000000 +0200 @@ -8,7 +8,7 @@ ARG ALPINE_VERSION=3.21 ARG BASE_DEBIAN_DISTRO=bookworm -ARG GO_VERSION=1.24.7 +ARG GO_VERSION=1.24.8 ARG XX_VERSION=1.6.1 ARG GOVERSIONINFO_VERSION=v1.4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/docker-bake.hcl new/docker-cli-28.5.1_ce/docker-bake.hcl --- old/docker-cli-28.5.0_ce/docker-bake.hcl 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/docker-bake.hcl 2025-10-08 04:50:32.000000000 +0200 @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.24.7" + default = "1.24.8" } variable "VERSION" { default = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.dev new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.dev --- old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.dev 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.dev 2025-10-08 04:50:32.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.24.7 +ARG GO_VERSION=1.24.8 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.lint new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.lint --- old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.lint 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.lint 2025-10-08 04:50:32.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.24.7 +ARG GO_VERSION=1.24.8 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.vendor new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.vendor --- old/docker-cli-28.5.0_ce/dockerfiles/Dockerfile.vendor 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/dockerfiles/Dockerfile.vendor 2025-10-08 04:50:32.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.24.7 +ARG GO_VERSION=1.24.8 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-28.5.0_ce/e2e/testdata/Dockerfile.gencerts new/docker-cli-28.5.1_ce/e2e/testdata/Dockerfile.gencerts --- old/docker-cli-28.5.0_ce/e2e/testdata/Dockerfile.gencerts 2025-10-02 16:36:11.000000000 +0200 +++ new/docker-cli-28.5.1_ce/e2e/testdata/Dockerfile.gencerts 2025-10-08 04:50:32.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.24.7 +ARG GO_VERSION=1.24.8 FROM golang:${GO_VERSION}-alpine AS generated ENV GOTOOLCHAIN=local ++++++ docker-integration.sh ++++++ --- /var/tmp/diff_new_pack.YTUIhM/_old 2025-10-11 22:49:09.562549324 +0200 +++ /var/tmp/diff_new_pack.YTUIhM/_new 2025-10-11 22:49:09.574549828 +0200 @@ -180,7 +180,9 @@ mv -nv /etc/docker/suse-secrets-enable{,-DISABLED} sudo systemctl restart docker -# Make sure docker-buildx is disabled. +# We need to disable docker-buildx for the integration-cli tests because +# otherwise the "docker build" command will use the wrong builder and the +# output won't match what the tests expect. [ -e /usr/lib/docker/cli-plugins/docker-buildx ] && \ mv -nv /usr/lib/docker/cli-plugins/docker-buildx{,-DISABLED} @@ -250,9 +252,6 @@ [ -n "$filter" ] && test_flags+=("-test.run" "$filter") if [[ "$suite_name" == "integration-cli" ]]; then - # We need to disable docker-buildx for the integration-cli tests - # because otherwise the "docker build" command will use the wrong - # builder and the output won't match what the tests expect. timeout=360m fi test_flags+=("-test.timeout" "$timeout")
