Merge 2a1ea05ed1 into 534f4a9fb1

fix: timeN function return final closure not be called (#21615 )
fix(docker): cicd image
2025-10-01 08:50:04 +02:00 · 2025-09-30 23:06:01 -07:00 · 2025-09-04 01:29:55 +08:00
3 changed files with 28 additions and 25 deletions
--- a/Dockerfile.cicd
+++ b/Dockerfile.cicd
@ -1,3 +1,3 @@
-FROM minio/minio:edge
+FROM minio/minio:latest

 CMD ["minio", "server", "/data"]
--- a/cmd/data-scanner-metric.go
+++ b/cmd/data-scanner-metric.go
@ -106,10 +106,9 @@ func (p *scannerMetrics) log(s scannerMetric, paths ...string) func(custom map[s

 // time n scanner actions.
 // Use for s < scannerMetricLastRealtime
-func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
+func (p *scannerMetrics) timeN(s scannerMetric) func(n int) {
 	startTime := time.Now()
-	return func(n int) func() {
-		return func() {
+	return func(n int) {
 		duration := time.Since(startTime)

 		atomic.AddUint64(&p.operations[s], uint64(n))
@ -117,7 +116,6 @@ func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
 			p.latency[s].add(duration)
 		}
 	}
-	}
 }

 // time a scanner action.
--- a/docker-buildx.sh
+++ b/docker-buildx.sh
@ -15,14 +15,19 @@ release=$(git describe --abbrev=0 --tags)
 docker buildx build --push --no-cache \
    --build-arg RELEASE="${release}" \
    -t "minio/minio:latest" \
-	-t "minio/minio:latest-cicd" \
    -t "quay.io/minio/minio:latest" \
-	-t "quay.io/minio/minio:latest-cicd" \
    -t "minio/minio:${release}" \
    -t "quay.io/minio/minio:${release}" \
    --platform=linux/arm64,linux/amd64,linux/ppc64le \
    -f Dockerfile.release .

+docker buildx build --push --no-cache \
+    --build-arg RELEASE="${release}" \
+    -t "minio/minio:latest-cicd" \
+    -t "quay.io/minio/minio:latest-cicd" \
+    --platform=linux/arm64,linux/amd64,linux/ppc64le \
+    -f Dockerfile.cicd .
+
 docker buildx prune -f

 docker buildx build --push --no-cache \
Author	SHA1	Message	Date
Job Stoit	1d4c9a57f1	Merge `2a1ea05ed1` into `534f4a9fb1`	2025-10-01 08:50:04 +02:00
yangw	534f4a9fb1	fix: timeN function return final closure not be called (#21615 ) VulnCheck / Analysis (push) Has been cancelled Details	2025-09-30 23:06:01 -07:00
Job Stoit	2a1ea05ed1	fix(docker): cicd image	2025-09-04 01:29:55 +08:00