From 1d5c07dedb249ddb32320c68cf8d268356df1bb2 Mon Sep 17 00:00:00 2001 From: quicksand Date: Wed, 9 Apr 2025 19:16:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20PLUGIN=5FS3=5FUSE=5FAWS=5FMANAGED=5FI?= =?UTF-8?q?AM=20AND=20PLUGIN=5FS3=5FUSE=5FPATH=5FSTYLE=20=E2=80=A6=20(#177?= =?UTF-8?q?02)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/.env.example | 4 ++-- docker/docker-compose-template.yaml | 4 ++-- docker/docker-compose.yaml | 8 ++++---- docker/middleware.env.example | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/.env.example b/docker/.env.example index 29d33360ea..0dc25fb5fc 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -1017,9 +1017,9 @@ PLUGIN_MEDIA_CACHE_PATH=assets # Plugin oss bucket PLUGIN_STORAGE_OSS_BUCKET= # Plugin oss s3 credentials -PLUGIN_S3_USE_AWS_MANAGED_IAM= +PLUGIN_S3_USE_AWS_MANAGED_IAM=true PLUGIN_S3_ENDPOINT= -PLUGIN_S3_USE_PATH_STYLE= +PLUGIN_S3_USE_PATH_STYLE=true PLUGIN_AWS_ACCESS_KEY= PLUGIN_AWS_SECRET_KEY= PLUGIN_AWS_REGION= diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml index d7bcff7ed1..236807812a 100644 --- a/docker/docker-compose-template.yaml +++ b/docker/docker-compose-template.yaml @@ -159,9 +159,9 @@ services: PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages} 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:-} + S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} - S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-} + S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} PAWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-} AWS_REGION: ${PLUGIN_AWS_REGION:-} diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index f120e19bed..e6fafd2dda 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -443,9 +443,9 @@ x-shared-env: &shared-api-worker-env PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages} PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets} PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-} - PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-} + PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true} PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} - PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-} + PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true} PLUGIN_AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} PLUGIN_AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-} PLUGIN_AWS_REGION: ${PLUGIN_AWS_REGION:-} @@ -615,9 +615,9 @@ services: PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages} 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:-} + S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true} S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-} - S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-} + S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true} AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-} PAWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-} AWS_REGION: ${PLUGIN_AWS_REGION:-} diff --git a/docker/middleware.env.example b/docker/middleware.env.example index eb38526d57..3fb9a51858 100644 --- a/docker/middleware.env.example +++ b/docker/middleware.env.example @@ -132,9 +132,9 @@ PLUGIN_MEDIA_CACHE_PATH=assets # Plugin oss bucket PLUGIN_STORAGE_OSS_BUCKET= # Plugin oss s3 credentials -PLUGIN_S3_USE_AWS_MANAGED_IAM= +PLUGIN_S3_USE_AWS_MANAGED_IAM=true PLUGIN_S3_ENDPOINT= -PLUGIN_S3_USE_PATH_STYLE= +PLUGIN_S3_USE_PATH_STYLE=true PLUGIN_AWS_ACCESS_KEY= PLUGIN_AWS_SECRET_KEY= PLUGIN_AWS_REGION=