Skip to content

Commit 988d5eb

Browse files
committed
Replacing Minio with Rustfs for tests
Fixes #489
1 parent 2deeda4 commit 988d5eb

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

docker-compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
services:
22
s3:
3-
image: minio/minio:latest
4-
command:
5-
- "server"
6-
- "start"
7-
- "--console-address"
8-
- ":9001"
3+
# image: minio/minio:latest
4+
image: rustfs/rustfs:1.0.0-alpha.77
5+
# command:
6+
# - "server"
7+
# - "start"
8+
# - "--console-address"
9+
# - ":9001"
910
ports:
1011
- 9000:9000
1112
- 9001:9001
1213
environment:
13-
- MINIO_ROOT_USER=test
14-
- MINIO_ROOT_PASSWORD=secretsss
14+
- RUSTFS_ACCESS_KEY=test
15+
- RUSTFS_SECRET_KEY=secretsss
1516
prometheus:
1617
image: prom/prometheus
1718
container_name: prometheus

pkg/test_tooling/containers/containers.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ const (
2121
EnterpriseLicenceKeyEnv = "ENTERPRISE_LICENSE"
2222
DefaultCloudUser = "test"
2323
DefaultCloudPass = "secretsss"
24-
s3UserEnv = "MINIO_ROOT_USER"
25-
s3PassKeyEnv = "MINIO_ROOT_PASSWORD" // #nosec G101
26-
s3ImageTag = "RELEASE.2025-09-07T16-13-09Z"
27-
s3Image = "minio/minio"
28-
S3UiPort = "9001"
29-
s3ApiPort = "9000"
30-
s3TcpPortFormatString = "%s/tcp"
24+
S3UiPort = "9001"
25+
s3ApiPort = "9000"
26+
s3TcpPortFormatString = "%s/tcp"
27+
//rustfs
28+
s3UserEnv = "RUSTFS_ACCESS_KEY"
29+
s3PassKeyEnv = "RUSTFS_SECRET_KEY" // #nosec G101
30+
s3ImageTag = "1.0.0-alpha.77"
31+
s3Image = "rustfs/rustfs"
3132
)
3233

3334
// BootstrapCloudStorage starts a S3 container for cloud storage testing.
@@ -41,12 +42,12 @@ func BootstrapCloudStorage(username, password string) (testcontainers.Container,
4142

4243
ctx := context.Background()
4344
req := testcontainers.ContainerRequest{
44-
Image: fmt.Sprintf("%s:%s", s3Image, s3ImageTag),
45-
Cmd: []string{"server", "start", "--console-address", ":" + S3UiPort},
45+
Image: fmt.Sprintf("%s:%s", s3Image, s3ImageTag),
4646
ExposedPorts: []string{fmt.Sprintf(s3TcpPortFormatString, s3ApiPort), fmt.Sprintf(s3TcpPortFormatString, S3UiPort)},
4747
Env: map[string]string{
4848
s3UserEnv: username,
4949
s3PassKeyEnv: password,
50+
// "RUST_LOG": "debug",
5051
},
5152
WaitingFor: wait.ForListeningPort(nat.Port(fmt.Sprintf(s3TcpPortFormatString, s3ApiPort))),
5253
}
@@ -84,7 +85,6 @@ func DefaultGrafanaEnv() map[string]string {
8485
"GF_INSTALL_PLUGINS": "grafana-googlesheets-datasource",
8586
"GF_AUTH_ANONYMOUS_ENABLED": "true",
8687
"GF_SECURITY_ADMIN_PASSWORD": "admin", // This is a no-op right now, but we should trickle this up to
87-
//"GF_SERVER_HTTP_ADDR": "::",
8888
// allow setting grafana admin credentials.
8989
}
9090
}

0 commit comments

Comments
 (0)