Merge 2a1ea05ed1 into 534f4a9fb1

Dockerfile.cicd

@@ -1,3 +1,3 @@
-FROM minio/minio:edge
+FROM minio/minio:latest
 
 CMD ["minio", "server", "/data"]

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(n int) {
-		return func() {
 		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.

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 \