Skip to content

Commit 1d5c07d

Browse files
fix : PLUGIN_S3_USE_AWS_MANAGED_IAM AND PLUGIN_S3_USE_PATH_STYLE … (#17702)
1 parent f148f1e commit 1d5c07d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

docker/.env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -1017,9 +1017,9 @@ PLUGIN_MEDIA_CACHE_PATH=assets
10171017
# Plugin oss bucket
10181018
PLUGIN_STORAGE_OSS_BUCKET=
10191019
# Plugin oss s3 credentials
1020-
PLUGIN_S3_USE_AWS_MANAGED_IAM=
1020+
PLUGIN_S3_USE_AWS_MANAGED_IAM=true
10211021
PLUGIN_S3_ENDPOINT=
1022-
PLUGIN_S3_USE_PATH_STYLE=
1022+
PLUGIN_S3_USE_PATH_STYLE=true
10231023
PLUGIN_AWS_ACCESS_KEY=
10241024
PLUGIN_AWS_SECRET_KEY=
10251025
PLUGIN_AWS_REGION=

docker/docker-compose-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ services:
159159
PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
160160
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
161161
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
162-
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-}
162+
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true}
163163
S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
164-
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-}
164+
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true}
165165
AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
166166
PAWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
167167
AWS_REGION: ${PLUGIN_AWS_REGION:-}

docker/docker-compose.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,9 @@ x-shared-env: &shared-api-worker-env
443443
PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
444444
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
445445
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
446-
PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-}
446+
PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true}
447447
PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
448-
PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-}
448+
PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true}
449449
PLUGIN_AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
450450
PLUGIN_AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
451451
PLUGIN_AWS_REGION: ${PLUGIN_AWS_REGION:-}
@@ -615,9 +615,9 @@ services:
615615
PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
616616
PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
617617
PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
618-
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-}
618+
S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-true}
619619
S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
620-
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-}
620+
S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-true}
621621
AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
622622
PAWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
623623
AWS_REGION: ${PLUGIN_AWS_REGION:-}

docker/middleware.env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ PLUGIN_MEDIA_CACHE_PATH=assets
132132
# Plugin oss bucket
133133
PLUGIN_STORAGE_OSS_BUCKET=
134134
# Plugin oss s3 credentials
135-
PLUGIN_S3_USE_AWS_MANAGED_IAM=
135+
PLUGIN_S3_USE_AWS_MANAGED_IAM=true
136136
PLUGIN_S3_ENDPOINT=
137-
PLUGIN_S3_USE_PATH_STYLE=
137+
PLUGIN_S3_USE_PATH_STYLE=true
138138
PLUGIN_AWS_ACCESS_KEY=
139139
PLUGIN_AWS_SECRET_KEY=
140140
PLUGIN_AWS_REGION=

0 commit comments

Comments
 (0)