From bb7b3c985b880f5dd0f74be60f63a9c2b0210051 Mon Sep 17 00:00:00 2001 From: Thomas Rogers Date: Thu, 31 Oct 2024 00:16:36 +0100 Subject: [PATCH] Fix Minio Environment Variable --- packages/api/src/repository/storage/S3StorageClient.ts | 5 ----- packages/api/src/repository/storage/storage.ts | 2 +- packages/api/src/util.ts | 2 ++ self-hosting/docker-compose/.env.example | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/api/src/repository/storage/S3StorageClient.ts b/packages/api/src/repository/storage/S3StorageClient.ts index 590a9cf4f..a7f0d3293 100644 --- a/packages/api/src/repository/storage/S3StorageClient.ts +++ b/packages/api/src/repository/storage/S3StorageClient.ts @@ -20,11 +20,6 @@ export class S3StorageClient implements StorageClient { this.s3Client = new S3Client({ forcePathStyle: true, endpoint: urlOverride, - region: 'us-east-1', - credentials: { - accessKeyId: 'minio', - secretAccessKey: 'miniominio', - }, }) } diff --git a/packages/api/src/repository/storage/storage.ts b/packages/api/src/repository/storage/storage.ts index 5a15299d7..f6a9dcf81 100644 --- a/packages/api/src/repository/storage/storage.ts +++ b/packages/api/src/repository/storage/storage.ts @@ -3,5 +3,5 @@ import { S3StorageClient } from './S3StorageClient' import { GcsStorageClient } from './GcsStorageClient' export const storage = env.fileUpload.useLocalStorage - ? new S3StorageClient('http://localhost:1010') + ? new S3StorageClient(env.fileUpload.localMinioUrl) : new GcsStorageClient(env.fileUpload?.gcsUploadSAKeyFilePath) diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts index 6fc9328d2..bf5f6837e 100755 --- a/packages/api/src/util.ts +++ b/packages/api/src/util.ts @@ -96,6 +96,7 @@ export interface BackendEnv { gcsUploadPrivateBucket: string dailyUploadLimit: number useLocalStorage: boolean + localMinioUrl: string } sender: { message: string @@ -323,6 +324,7 @@ export function getEnv(): BackendEnv { ? parseInt(parse('GCS_UPLOAD_DAILY_LIMIT'), 10) : 5, // default to 5 useLocalStorage: parse('GCS_USE_LOCAL_HOST') == 'true', + localMinioUrl: parse('LOCAL_MINIO_URL'), } const sender = { message: parse('SENDER_MESSAGE'), diff --git a/self-hosting/docker-compose/.env.example b/self-hosting/docker-compose/.env.example index e429e6b6c..be71462d4 100644 --- a/self-hosting/docker-compose/.env.example +++ b/self-hosting/docker-compose/.env.example @@ -34,6 +34,7 @@ CONTENT_FETCH_QUEUE_ENABLED=true IMAGE_PROXY_URL=http://localhost:7070 # Need to change this for NGINX CLIENT_URL=http://localhost:3000 # Need to change this when using NGINX +LOCAL_MINIO_URL=http://localhost:1010 # Redis REDIS_URL=redis://redis:6379/0