Skip to content

Commit 53674f5

Browse files
bonsairobofslabs-bot[bot]
authored andcommitted
fix: remove bad copy-pasted options for minio
1 parent c892eb5 commit 53674f5

5 files changed

Lines changed: 7 additions & 12 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
66
name = "cargo-fslabscli"
77
publish = ["foresight_mining_software_corporation"]
88
repository = "https://github.com/ForesightMiningSoftwareCorporation/fslabsci"
9-
version = "2.32.1"
9+
version = "2.32.2"
1010

1111
[package.metadata.fslabs.publish.binary]
1212
name = "FSLABS Cli tool"

crates/fsl_test_api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fsl_test_api"
3-
version = "2.30.0"
3+
version = "2.32.0"
44
description = "API for use within tests that depend on the fslabscli test runner"
55
authors = ["FSLABS DevOps Gods"]
66
edition = "2024"

crates/fsl_test_api/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use envconfig::Envconfig;
22
use url::Url;
33

44
/// Environment variables created by the test runner for use in tests.
5-
#[derive(Envconfig)]
5+
#[derive(Clone, Debug, Envconfig, Eq, PartialEq)]
66
pub struct FslTestEnv {
77
/// The URL used for connecting to the Postgres service.
88
///

src/commands/tests/docker_service.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub struct DockerContainer {
77
pub prefix: String,
88
pub env: String,
99
pub port: String,
10-
pub options: String,
1110
pub image: String,
1211
pub command: String,
1312
}
@@ -18,7 +17,6 @@ impl DockerContainer {
1817
prefix: "azurite".into(),
1918
env: "".into(),
2019
port: format!("-p {blob_port}:10000"),
21-
options: "".into(),
2220
image: "mcr.microsoft.com/azure-storage/azurite".into(),
2321
command: Default::default(),
2422
}
@@ -29,9 +27,8 @@ impl DockerContainer {
2927
prefix: "minio".into(),
3028
env: "-e MINIO_ROOT_USER=minioadmin -e MINIO_ROOT_PASSWORD=minioadmin".into(),
3129
port: format!("-p {service_port}:9000"),
32-
options: "server /data --console-address :9001".into(),
3330
image: "minio/minio:latest".into(),
34-
command: "server /data --address=0.0.0.0:9000".into(),
31+
command: "server /data".into(),
3532
}
3633
}
3734

@@ -40,7 +37,6 @@ impl DockerContainer {
4037
prefix: "postgres".into(),
4138
env: format!("-e POSTGRES_PASSWORD={DB_PASSWORD} -e POSTGRES_DB={DB_NAME}"),
4239
port: format!("-p {port}:5432"),
43-
options: "".into(),
4440
image: "postgres:alpine".into(),
4541
command: Default::default(),
4642
}
@@ -51,15 +47,14 @@ impl DockerContainer {
5147
prefix,
5248
env,
5349
port,
54-
options,
5550
image,
5651
command,
5752
} = self;
5853
let suffix = Alphanumeric.sample_string(&mut rand::rng(), 6);
5954
let container_name = format!("{prefix}_{suffix}");
6055
let path = std::env::current_dir().unwrap();
6156
let command_output = Script::new(format!(
62-
"docker run --name={container_name} -d {env} {port} {options} {image} {command}"
57+
"docker run --name={container_name} -d {env} {port} {image} {command}"
6358
))
6459
.current_dir(&path)
6560
.execute()

0 commit comments

Comments
 (0)