Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Switch from minio to garage (#2343)

Luke Vellad9ab8a005cb3
diff --git a/apps/web/.env.sample b/apps/web/.env.sample
index 294d23e5c..9599772a2 100644
--- a/apps/web/.env.sample
+++ b/apps/web/.env.sample
@@ -27,11 +27,12 @@ SMTP_USER=
SMTP_PWD=
# Object Storage (S3) (optional)
-# Defaults below are configured for the local MinIO instance (see docker-compose.dev.yml)
+# Defaults below are configured for the local Garage instance (see docker-compose.dev.yml)
S3_BUCKET_NAME=rallly
-S3_ENDPOINT=http://0.0.0.0:9000
-S3_ACCESS_KEY_ID=minio
-S3_SECRET_ACCESS_KEY=minio123
+S3_ENDPOINT=http://localhost:3900
+S3_ACCESS_KEY_ID=rallly-access-key
+S3_SECRET_ACCESS_KEY=rallly-secret-key
+S3_REGION=garage
# Optional: serve stored assets directly from a CDN instead of proxying through /api/storage/
# NEXT_PUBLIC_CDN_BASE_URL=https://example.cloudfront.net
diff --git a/apps/web/src/lib/storage/s3.ts b/apps/web/src/lib/storage/s3.ts
index 67a87e6ca..9f3633fc9 100644
--- a/apps/web/src/lib/storage/s3.ts
+++ b/apps/web/src/lib/storage/s3.ts
@@ -20,6 +20,8 @@ export function getS3Client() {
},
// S3 compatible storage requires path style
forcePathStyle: true,
+ // Disable default CRC32 checksums for S3-compatible stores
+ requestChecksumCalculation: "WHEN_REQUIRED",
});
return s3Client;
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d0ed90e24..6440acb72 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -34,17 +34,28 @@ services:
SRH_MODE: env
SRH_TOKEN: dev_fake_token_123456789abcdefghijklmnop
SRH_CONNECTION_STRING: "redis://redis:6379"
- minio:
- image: minio/minio
- command: server /data --console-address ":9001"
+ garage:
+ image: dxflrs/garage:v2.3.0
+ restart: always
ports:
- - "9000:9000"
- - "9001:9001"
- environment:
- MINIO_ROOT_USER: minio
- MINIO_ROOT_PASSWORD: minio123
+ - "3900:3900"
+ - "3903:3903"
volumes:
- - s3-data:/data
+ - ./docker/garage.toml:/etc/garage.toml:ro
+ - garage-meta:/var/lib/garage/meta
+ - garage-data:/var/lib/garage/data
+ environment:
+ - GARAGE_DEFAULT_ACCESS_KEY=rallly-access-key
+ - GARAGE_DEFAULT_SECRET_KEY=rallly-secret-key
+ - GARAGE_DEFAULT_BUCKET=rallly
+ command: /garage server --single-node --default-bucket
+ healthcheck:
+ test: ["CMD", "/garage", "stats", "-a"]
+ interval: 1h
+ timeout: 5s
+ retries: 3
+ start_period: 10s
+ start_interval: 5s
mailpit:
image: axllent/mailpit
ports:
@@ -57,24 +68,26 @@ services:
retries: 5
- # This service just make sure a bucket with the right policies is created
- createbuckets:
- image: minio/mc
+ garage_init:
+ image: amazon/aws-cli
depends_on:
- - minio
- entrypoint: >
- /bin/sh -c "
- sleep 10;
- /usr/bin/mc alias set minio http://minio:9000 minio minio123;
- /usr/bin/mc mb minio/rallly;
- /usr/bin/mc anonymous set public minio/rallly/public;
- exit 0;
- "
+ garage:
+ condition: service_healthy
+ environment:
+ - AWS_ACCESS_KEY_ID=rallly-access-key
+ - AWS_SECRET_ACCESS_KEY=rallly-secret-key
+ - AWS_DEFAULT_REGION=garage
+ volumes:
+ - ./docker/cors.json:/cors.json:ro
+ entrypoint: ["sh", "-c", "aws --endpoint-url http://garage:3900 s3api put-bucket-cors --bucket rallly --cors-configuration file:///cors.json"]
+ restart: "no"
volumes:
db-data:
driver: local
redis-data:
driver: local
- s3-data:
+ garage-meta:
+ driver: local
+ garage-data:
driver: local
diff --git a/docker/cors.json b/docker/cors.json
new file mode 100644
index 000000000..6c4c44d15
--- /dev/null
+++ b/docker/cors.json
@@ -0,0 +1,11 @@
+{
+ "CORSRules": [
+ {
+ "AllowedOrigins": ["*"],
+ "AllowedMethods": ["GET", "PUT", "POST", "HEAD"],
+ "AllowedHeaders": ["*"],
+ "ExposeHeaders": ["ETag"],
+ "MaxAgeSeconds": 3600
+ }
+ ]
+}
diff --git a/docker/garage.toml b/docker/garage.toml
new file mode 100644
index 000000000..972e47bcf
--- /dev/null
+++ b/docker/garage.toml
@@ -0,0 +1,17 @@
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+
+db_engine = "sqlite"
+
+replication_factor = 1
+
+rpc_bind_addr = "[::]:3901"
+rpc_secret = "0000000000000000000000000000000000000000000000000000000000000000"
+
+[s3_api]
+api_bind_addr = "[::]:3900"
+s3_region = "garage"
+root_domain = ".s3.garage.localhost"
+
+[admin]
+api_bind_addr = "[::]:3903"