From 8f2a30d9afb439ab40b80e123e74c39f174688ec Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Wed, 2 Sep 2026 14:06:56 +0800 Subject: [PATCH] build: bundle mcli 20260901 and describe the component pins mcli RELEASE.2026-09-01 carries the credential redaction fixes for --debug output. The go.mod comments now state what the Console and silo-pkg pins are: the last commits that consume silo-pkg through the github.com/minio/pkg/v3 replacement, since silo-pkg v3.13.0 and Console v2.3.0 moved to the pgsty/silo-pkg module path. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01PvgysXDmhPBBimCReYtA8q Signed-off-by: Feng Ruohang --- Dockerfile.goreleaser | 6 +++--- buildscripts/install-mcli.sh | 2 +- go.mod | 14 +++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser index 15d03aadf..a82aa8497 100644 --- a/Dockerfile.goreleaser +++ b/Dockerfile.goreleaser @@ -6,9 +6,9 @@ ENV GOPATH=/go ENV CGO_ENABLED=0 ARG MC_REPO=pgsty/mc -ARG MC_VERSION=RELEASE.2026-08-06T00-00-00Z -ARG MC_AMD64_SHA256=4b488bd30af54ad4214e5b654746677c79cd93dc6cad4be3aa2d09dbb48370ff -ARG MC_ARM64_SHA256=83f6fedb16ed9c1e8efa8aea6776203dff132bc474214543d5c0767ed2066c2f +ARG MC_VERSION=RELEASE.2026-09-01T00-00-00Z +ARG MC_AMD64_SHA256=6387cbeebb17c4bd52b447ee332ba22777e129034befa6598308c3aa04f02d09 +ARG MC_ARM64_SHA256=5fc434c7e416bb4787e92306a8165d55284aac639a29744160b2a198fdd7573a RUN apk add -U --no-cache \ ca-certificates \ diff --git a/buildscripts/install-mcli.sh b/buildscripts/install-mcli.sh index ba231e9b4..dd2dcdb4f 100755 --- a/buildscripts/install-mcli.sh +++ b/buildscripts/install-mcli.sh @@ -40,7 +40,7 @@ if [ -n "${MCLI_BIN:-}" ]; then exit 0 fi -release=${MCLI_RELEASE:-RELEASE.2026-08-06T00-00-00Z} +release=${MCLI_RELEASE:-RELEASE.2026-09-01T00-00-00Z} version_hyphen=${release#RELEASE.} package_version=$(printf '%s\n' "${version_hyphen}" | sed -E 's/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2})-([0-9]{2})-([0-9]{2})Z$/\1\2\3\4\5\6.0.0/') if [ "${package_version}" = "${version_hyphen}" ]; then diff --git a/go.mod b/go.mod index a60ee4806..8b7e79a1e 100644 --- a/go.mod +++ b/go.mod @@ -7,17 +7,21 @@ go 1.27.0 // are ignored when this module is consumed as a dependency. replace github.com/minio/minio-go/v7 => github.com/pgsty/silo-go/v7 v7.3.1 -// Use Pigsty's SILO Console v2.2.1 release while preserving upstream import paths. -// The pseudo-version pins v2.2.1's commit because the compatible module path has no /v2 suffix. +// Use Pigsty's SILO Console while preserving upstream import paths. The +// pseudo-version pins v2.2.1 plus its dependency pins: the last Console commit +// that still consumes silo-pkg through the github.com/minio/pkg/v3 replacement +// below. Console v2.3.0 and later require github.com/pgsty/silo-pkg/v3 directly. replace github.com/minio/console => github.com/pgsty/silo-console v0.0.0-20260829111139-e07ef01ab8bf // Use Pigsty's maintained mc fork for Console's embedded client code. replace github.com/minio/mc => github.com/pgsty/mc v0.0.0-20260829103737-5ed037ef4ec1 // Use Pigsty's maintained SILO package fork while preserving upstream import paths. -// This retains the LDAP TLS fix tracked in https://github.com/pgsty/silo/issues/15. -// v3.12.2 retains the minio/minio#20449 bucket-write boundary hardening, -// rejects bare ARN prefixes on strict policy-write paths, and selects Silo Go v7.3.1. +// This retains the LDAP TLS fix tracked in https://github.com/pgsty/silo/issues/15, +// the minio/minio#20449 bucket-write boundary hardening, bare ARN rejection on +// strict policy-write paths, and Silo Go v7.3.1. It is the last silo-pkg commit +// that declares the github.com/minio/pkg/v3 module path; v3.13.0 moved to +// github.com/pgsty/silo-pkg/v3 and cannot be selected through this replace. replace github.com/minio/pkg/v3 => github.com/pgsty/silo-pkg/v3 v3.12.3-0.20260829103855-748c94bf8ab7 // v22.7.0 does not compile on NetBSD because its unix implementation uses