From 3ee2ce471fba66b00a64ea4b9e01912c7fa84644 Mon Sep 17 00:00:00 2001 From: Kalo Chin Date: Wed, 2 Jul 2025 21:10:20 +0900 Subject: [PATCH 1/3] Set default S3_USE_AWS to false in compose file Updated the docker-compose.yaml to default the S3_USE_AWS environment variable to 'false' if not set, ensuring consistent behavior when the variable is unset. --- docker/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 8f84c0c0f36959..7f91fd879623a7 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -683,7 +683,7 @@ services: PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets} PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-} S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false} - S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-} + S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} From 5c2a9e587111169f37e7ac0730fa55781b107b1d Mon Sep 17 00:00:00 2001 From: Kalo Chin Date: Wed, 2 Jul 2025 22:36:38 +0900 Subject: [PATCH 2/3] Revert "Set default S3_USE_AWS to false in compose file" This reverts commit 3ee2ce471fba66b00a64ea4b9e01912c7fa84644. --- docker/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 7f91fd879623a7..8f84c0c0f36959 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -683,7 +683,7 @@ services: PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets} PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-} S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false} - S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false} + S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} From 4c4c6e3bcf8f9adda6b81104ec70584c148c4ae4 Mon Sep 17 00:00:00 2001 From: Kalo Chin Date: Wed, 2 Jul 2025 22:37:13 +0900 Subject: [PATCH 3/3] Set default S3_USE_AWS to false in compose files Updated both docker-compose-template.yaml and docker-compose.yaml to set the default value of S3_USE_AWS to 'false' instead of an empty string. This ensures consistent and explicit default behavior for S3 usage configuration. --- docker/docker-compose-template.yaml | 2 +- docker/docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml index 40077190764391..d45f8f8bfa5c2f 100644 --- a/docker/docker-compose-template.yaml +++ b/docker/docker-compose-template.yaml @@ -168,7 +168,7 @@ services: PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets} PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-} S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false} - S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-} + S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 8f84c0c0f36959..7f91fd879623a7 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -683,7 +683,7 @@ services: PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets} PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-} S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false} - S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-} + S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}