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>
This commit is contained in:
Bruce Ashfield 2025-10-18 20:13:20 -04:00
parent 424f6c5701
commit 03eb707025
2 changed files with 1 additions and 47 deletions

View File

@ -3,11 +3,10 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
SRCREV_distribution = "da404778edd3faa665e48ca3bb791b6144f3355e"
SRCREV_distribution = "76fe6170526f0a1046c340c20b041a090d8dbfc9"
SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \
file://docker-registry.service \
file://0001-build-use-to-use-cross-go-compiler.patch \
file://0001-s3-aws-fix-build-for-386.patch \
"
PACKAGES =+ "docker-registry"

View File

@ -1,45 +0,0 @@
From 6970080b10a53d858dd444a643a2bd911de12940 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 29 May 2025 11:28:38 +0800
Subject: [PATCH] s3-aws: fix build for 386
When building for 386, we got the following build error:
registry/storage/driver/s3-aws/s3.go:312:99: cannot use
maxChunkSize (untyped int constant 5368709120) as int value
in argument to getParameterAsInteger (overflows)
This is because the s3_64bit.go is used. Adjust the build tag matching
in s3_32bit.go and s3_64bit.go to fix this issue.
Upstream-Status: Submitted [https://github.com/distribution/distribution/pull/4642]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
registry/storage/driver/s3-aws/s3_32bit.go | 2 +-
registry/storage/driver/s3-aws/s3_64bit.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/registry/storage/driver/s3-aws/s3_32bit.go b/registry/storage/driver/s3-aws/s3_32bit.go
index 218e3eab..84161fcb 100644
--- a/registry/storage/driver/s3-aws/s3_32bit.go
+++ b/registry/storage/driver/s3-aws/s3_32bit.go
@@ -1,4 +1,4 @@
-//go:build arm
+//go:build arm || 386
package s3
diff --git a/registry/storage/driver/s3-aws/s3_64bit.go b/registry/storage/driver/s3-aws/s3_64bit.go
index 55254e49..2ed1f92f 100644
--- a/registry/storage/driver/s3-aws/s3_64bit.go
+++ b/registry/storage/driver/s3-aws/s3_64bit.go
@@ -1,4 +1,4 @@
-//go:build !arm
+//go:build !arm && !386
package s3
--
2.34.1