summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-10-18 20:13:20 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2025-10-18 20:17:34 -0400
commit03eb707025801eb396f4378dced696c156994f53 (patch)
tree9d0b1695fba5ad8cd847d3eb4d4e4989fb23f2b0
parent424f6c57016d8b2ff56e8ef9bbe2a980a3d2abc2 (diff)
downloadmeta-virtualization-03eb707025801eb396f4378dced696c156994f53.tar.gz
docker-distribution: update to v3.0.0-tip
We drop a patch that is now in the upstrem project, as well as the new commits below: Bumping distribution to version v3.0.0-63-g76fe6170, which comprises the following commits: 0e77b285 chore: labeler: add area/client mapping for internal/client/** 2f1a51dc client: add Accept headers to Exists() HEAD ad5d9994 build(deps): bump github/codeql-action from 4.30.7 to 4.30.8 6d764586 build(deps): bump github/codeql-action from 3.26.5 to 4.30.7 11519e6d build(deps): bump ossf/scorecard-action from 2.4.2 to 2.4.3 99c47b61 build(deps): bump actions/labeler from 5 to 6 e1e5d051 build(deps): bump actions/setup-go from 5 to 6 f5512709 build(deps): bump actions/upload-pages-artifact from 3 to 4 0fb77d6a Fix broken link to Docker Hub fair use policy 251bf1b9 build(deps): bump actions/checkout from 4 to 5 6e59b824 Fixes #4683 - uses X/Y instead of Gx/Gy for thumbprint of ecdsa keys b559f27a Switch to UUIDv7 b39441b1 Fix markdown syntax for OTEL traces link in docs 53dde7fc fix: set OTEL traces to disabled by default 68cd681b docs: Add note about `OTEL_TRACES_EXPORTER` 1fc84617 fix tests 02b1f6e3 fix(registry/handlers/app): redis CAs bb278c2b fix: fixed data race in TestSchedule test b09be3d6 build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2 6970080b s3-aws: fix build for 386 e629f886 docs: Add OpenTelemetry links to quickstart docs (#4270) fea36383 refactor: replace map iteration with maps.Copy/Clone 369663e4 Fix S3 driver loglevel param Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/docker-distribution/docker-distribution_git.bb3
-rw-r--r--recipes-containers/docker-distribution/files/0001-s3-aws-fix-build-for-386.patch45
2 files changed, 1 insertions, 47 deletions
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index d831ce5f..5e37fe74 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -3,11 +3,10 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
3LICENSE = "Apache-2.0" 3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
5 5
6SRCREV_distribution = "da404778edd3faa665e48ca3bb791b6144f3355e" 6SRCREV_distribution = "76fe6170526f0a1046c340c20b041a090d8dbfc9"
7SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \ 7SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \
8 file://docker-registry.service \ 8 file://docker-registry.service \
9 file://0001-build-use-to-use-cross-go-compiler.patch \ 9 file://0001-build-use-to-use-cross-go-compiler.patch \
10 file://0001-s3-aws-fix-build-for-386.patch \
11 " 10 "
12 11
13PACKAGES =+ "docker-registry" 12PACKAGES =+ "docker-registry"
diff --git a/recipes-containers/docker-distribution/files/0001-s3-aws-fix-build-for-386.patch b/recipes-containers/docker-distribution/files/0001-s3-aws-fix-build-for-386.patch
deleted file mode 100644
index 4fbae6e4..00000000
--- a/recipes-containers/docker-distribution/files/0001-s3-aws-fix-build-for-386.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 6970080b10a53d858dd444a643a2bd911de12940 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 29 May 2025 11:28:38 +0800
4Subject: [PATCH] s3-aws: fix build for 386
5
6When building for 386, we got the following build error:
7
8 registry/storage/driver/s3-aws/s3.go:312:99: cannot use
9 maxChunkSize (untyped int constant 5368709120) as int value
10 in argument to getParameterAsInteger (overflows)
11
12This is because the s3_64bit.go is used. Adjust the build tag matching
13in s3_32bit.go and s3_64bit.go to fix this issue.
14
15Upstream-Status: Submitted [https://github.com/distribution/distribution/pull/4642]
16
17Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18---
19 registry/storage/driver/s3-aws/s3_32bit.go | 2 +-
20 registry/storage/driver/s3-aws/s3_64bit.go | 2 +-
21 2 files changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/registry/storage/driver/s3-aws/s3_32bit.go b/registry/storage/driver/s3-aws/s3_32bit.go
24index 218e3eab..84161fcb 100644
25--- a/registry/storage/driver/s3-aws/s3_32bit.go
26+++ b/registry/storage/driver/s3-aws/s3_32bit.go
27@@ -1,4 +1,4 @@
28-//go:build arm
29+//go:build arm || 386
30
31 package s3
32
33diff --git a/registry/storage/driver/s3-aws/s3_64bit.go b/registry/storage/driver/s3-aws/s3_64bit.go
34index 55254e49..2ed1f92f 100644
35--- a/registry/storage/driver/s3-aws/s3_64bit.go
36+++ b/registry/storage/driver/s3-aws/s3_64bit.go
37@@ -1,4 +1,4 @@
38-//go:build !arm
39+//go:build !arm && !386
40
41 package s3
42
43--
442.34.1
45