From c4b975bf45238ea38725fef9fce2933324d7701b Mon Sep 17 00:00:00 2001 From: francoism90 Date: Fri, 24 Oct 2025 14:30:36 +0200 Subject: [PATCH 1/2] Add rustfs service to Docker Compose and update service list --- .../InteractsWithDockerComposeServices.php | 3 +- stubs/rustfs.stub | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 stubs/rustfs.stub diff --git a/src/Console/Concerns/InteractsWithDockerComposeServices.php b/src/Console/Concerns/InteractsWithDockerComposeServices.php index daed24a1..8e51b606 100644 --- a/src/Console/Concerns/InteractsWithDockerComposeServices.php +++ b/src/Console/Concerns/InteractsWithDockerComposeServices.php @@ -35,6 +35,7 @@ trait InteractsWithDockerComposeServices 'meilisearch', 'typesense', 'minio', + 'rustfs', 'mailpit', 'rabbitmq', 'selenium', @@ -107,7 +108,7 @@ protected function buildDockerCompose(array $services) // Merge volumes... collect($services) ->filter(function ($service) { - return in_array($service, ['mysql', 'pgsql', 'mariadb', 'mongodb', 'redis', 'valkey', 'meilisearch', 'typesense', 'minio', 'rabbitmq']); + return in_array($service, ['mysql', 'pgsql', 'mariadb', 'mongodb', 'redis', 'valkey', 'meilisearch', 'typesense', 'minio', 'rustfs', 'rabbitmq']); })->filter(function ($service) use ($compose) { return ! array_key_exists($service, $compose['volumes'] ?? []); })->each(function ($service) use (&$compose) { diff --git a/stubs/rustfs.stub b/stubs/rustfs.stub new file mode 100644 index 00000000..854fa229 --- /dev/null +++ b/stubs/rustfs.stub @@ -0,0 +1,30 @@ +rustfs: + image: 'rustfs/rustfs:latest' + ports: + - '${FORWARD_RUSTFS_PORT:-9000}:9000' + - '${FORWARD_RUSTFS_CONSOLE_PORT:-9001}:9001' + environment: + RUSTFS_VOLUMES: '/data' + RUSTFS_ADDRESS: '0.0.0.0:9000' + RUSTFS_CONSOLE_ADDRESS: '0.0.0.0:9001' + RUSTFS_CONSOLE_ENABLE: 'true' + RUSTFS_EXTERNAL_ADDRESS: ':9000' + RUSTFS_CORS_ALLOWED_ORIGINS: '*' + RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS: '*' + RUSTFS_ACCESS_KEY: 'sail' + RUSTFS_SECRET_KEY: 'password' + volumes: + - 'sail-rustfs:/data' + networks: + - sail + healthcheck: + test: + [ + "CMD", + "sh", "-c", + "curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/health" + ] + interval: 30s + timeout: 10s + retries: 3 + start_period: 40s From fbc6207d81cda917cf9072057e026adf6e587f79 Mon Sep 17 00:00:00 2001 From: francoism90 Date: Fri, 24 Oct 2025 14:31:41 +0200 Subject: [PATCH 2/2] Fix RUSTFS_LOG_LEVEL formatting in rustfs.stub --- stubs/rustfs.stub | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/rustfs.stub b/stubs/rustfs.stub index 854fa229..f5bd35ed 100644 --- a/stubs/rustfs.stub +++ b/stubs/rustfs.stub @@ -13,6 +13,7 @@ rustfs: RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS: '*' RUSTFS_ACCESS_KEY: 'sail' RUSTFS_SECRET_KEY: 'password' + RUSTFS_LOG_LEVEL: 'info', volumes: - 'sail-rustfs:/data' networks: