Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
<dep.airlift-units.version>1.10</dep.airlift-units.version>
<dep.jersey.version>3.1.9</dep.jersey.version>
<dep.testcontainers.version>1.19.8</dep.testcontainers.version>
<dep.minio.version>8.5.9</dep.minio.version>
<!-- in sync with container cgr.dev/chainguard/minio in S3Container -->
<dep.minio.version>8.6.0</dep.minio.version>
<dep.docker.version>3.3.6</dep.docker.version>
<dep.awaitility.version>4.1.1</dep.awaitility.version>
<dep.caffeine.version>3.1.8</dep.caffeine.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public class S3Container

public static final String POLICY_NAME = "managedPolicy";

private static final String IMAGE_NAME = "minio/minio";
private static final String IMAGE_TAG = "RELEASE.2024-07-15T19-02-30Z";
// Keep in sync with dep.minio.version in pom.xml
private static final String IMAGE = "cgr.dev/chainguard/minio@sha256:66bd82c8fe5e75868ae7d0b2e102d9a0dcf971b270a41bd060a9e6a643476ff8";

private static final String CONFIG_TEMPLATE = """
{
Expand Down Expand Up @@ -111,7 +111,7 @@ public S3Container(@ForS3Container List<String> initialBuckets, @ForS3Container
Transferable config = Transferable.of(CONFIG_TEMPLATE.formatted(credential.accessKey(), credential.secretKey()));
Transferable policyFile = Transferable.of(POLICY);

container = new MinIOContainer(DockerImageName.parse(IMAGE_NAME).withTag(IMAGE_TAG))
container = new MinIOContainer(DockerImageName.parse(IMAGE).asCompatibleSubstituteFor("minio/minio"))
.withUserName(credential.accessKey())
.withPassword(credential.secretKey())
.withEnv("MC_CONFIG_DIR", "/root/.mc/")
Expand All @@ -120,6 +120,8 @@ public S3Container(@ForS3Container List<String> initialBuckets, @ForS3Container
.withCopyToContainer(policyFile, "/root/policy.json");

container.withEnv("MINIO_DOMAIN", LOCALHOST_DOMAIN);
// Required to create buckets externally
container.withCreateContainerCmdModifier(cmd -> cmd.withUser("root"));
container.start();

log.info("S3 container started on port: %s", container.getFirstMappedPort());
Expand Down
Loading