diff --git a/Dockerfile b/Dockerfile index 6f60be2e2be6..6a83e5b16b53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,7 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.18.2 ARG NERDCTL_VERSION=v2.2.1 ARG DNSNAME_VERSION=v1.3.1 ARG NYDUS_VERSION=v2.4.0 -ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z -ARG MINIO_MC_VERSION=RELEASE.2025-08-13T08-35-41Z +ARG SILO_VERSION=RELEASE.2026-09-03T13-18-01Z ARG AZURITE_VERSION=3.35.0 ARG GOTESTSUM_VERSION=v1.13.0 ARG DELVE_VERSION=v1.26.0 @@ -29,9 +28,8 @@ ARG GO_VERSION=1.26 ARG XX_VERSION=1.9.0 ARG BUILDKIT_DEBUG -# minio for s3 integration tests -FROM quay.io/minio/minio:${MINIO_VERSION} AS minio -FROM quay.io/minio/mc:${MINIO_MC_VERSION} AS minio-mc +# silo for s3 integration tests +FROM pgsty/silo:${SILO_VERSION} AS silo # xx is a helper for cross-compilation FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx @@ -460,8 +458,8 @@ RUN --mount=target=/tmp/gen_ssh_test_env.sh,source=hack/fixtures/gen_ssh_test_en ENV CGO_ENABLED=0 ENV GOTESTSUM_FORMAT=standard-verbose COPY --link --from=gotestsum /out /usr/bin/ -COPY --link --from=minio /usr/bin/minio /usr/bin/ -COPY --link --from=minio-mc /usr/bin/mc /usr/bin/ +COPY --link --from=silo /usr/bin/silo /usr/bin/ +COPY --link --from=silo /usr/bin/mcli /usr/bin/mc COPY --link --from=nydus /out/nydus-static/* /usr/bin/ COPY --link --from=stargz-snapshotter /out/* /usr/bin/ COPY --link --from=rootlesskit /rootlesskit /usr/bin/ diff --git a/util/testutil/helpers/minio.go b/util/testutil/helpers/minio.go index 8fa877b9c92d..f28bd058bf1e 100644 --- a/util/testutil/helpers/minio.go +++ b/util/testutil/helpers/minio.go @@ -16,8 +16,8 @@ import ( ) const ( - minioBin = "minio" - mcBin = "mc" + siloBin = "silo" + mcBin = "mc" ) type MinioOpts struct { @@ -30,8 +30,8 @@ func NewMinioServer(t *testing.T, sb integration.Sandbox, opts MinioOpts) (addre t.Helper() bucket = randomString(10) - if _, err := exec.LookPath(minioBin); err != nil { - return "", "", nil, errors.Wrapf(err, "failed to lookup %s binary", minioBin) + if _, err := exec.LookPath(siloBin); err != nil { + return "", "", nil, errors.Wrapf(err, "failed to lookup %s binary", siloBin) } if _, err := exec.LookPath(mcBin); err != nil { return "", "", nil, errors.Wrapf(err, "failed to lookup %s binary", mcBin) @@ -60,7 +60,7 @@ func NewMinioServer(t *testing.T, sb integration.Sandbox, opts MinioOpts) (addre address = "http://" + addr // start server - cmd := exec.CommandContext(context.TODO(), minioBin, "server", "--json", "--address", addr, t.TempDir()) + cmd := exec.CommandContext(context.TODO(), siloBin, "server", "--json", "--address", addr, t.TempDir()) cmd.Env = append(os.Environ(), []string{ "MINIO_ROOT_USER=" + opts.AccessKeyID, "MINIO_ROOT_PASSWORD=" + opts.SecretAccessKey,