MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-01 02:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

do not pass master_key to secret_key

Browse Source
This commit is contained in:
Harshavardhana 2021-05-05 15:20:02 -07:00
parent b4f4cd1d5d
commit dec5d8f17c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dockerscripts/docker-entrypoint.sh
View File

@ -57,8 +57,8 @@ docker_secrets_env() {
fi fi
} }
## Set KMS_MASTER_KEY from docker secrets if provided ## Set KMS_SECRET_KEY from docker secrets if provided
docker_kms_encryption_env() { docker_kms_secret_encryption_env() {
if [ -f "$MINIO_KMS_SECRET_KEY_FILE" ]; then if [ -f "$MINIO_KMS_SECRET_KEY_FILE" ]; then
KMS_SECRET_KEY_FILE="$MINIO_KMS_SECRET_KEY_FILE" KMS_SECRET_KEY_FILE="$MINIO_KMS_SECRET_KEY_FILE"
else else
@ -72,13 +72,13 @@ docker_kms_encryption_env() {
} }
## Legacy ## Legacy
## Set SSE_MASTER_KEY from docker secrets if provided ## Set KMS_MASTER_KEY from docker secrets if provided
docker_sse_encryption_env() { docker_kms_master_encryption_env() {
KMS_SECRET_KEY_FILE="/run/secrets/$MINIO_KMS_MASTER_KEY_FILE" KMS_MASTER_KEY_FILE="/run/secrets/$MINIO_KMS_MASTER_KEY_FILE"
if [ -f "$KMS_SECRET_KEY_FILE" ]; then if [ -f "$KMS_MASTER_KEY_FILE" ]; then
MINIO_KMS_SECRET_KEY="$(cat "$KMS_SECRET_KEY_FILE")" MINIO_KMS_MASTER_KEY="$(cat "$KMS_MASTER_KEY_FILE")"
export MINIO_KMS_SECRET_KEY export MINIO_KMS_MASTER_KEY
fi fi
} }
@ -98,17 +98,17 @@ docker_switch_user() {
fi fi
} }
## Set access env from secrets if necessary. ## Set access env from secrets if necessary. Legacy
docker_secrets_env_old docker_secrets_env_old
## Set access env from secrets if necessary. ## Set access env from secrets if necessary. Override
docker_secrets_env docker_secrets_env
## Set kms encryption from secrets if necessary.
docker_kms_encryption_env
## Set sse encryption from secrets if necessary. Legacy ## Set sse encryption from secrets if necessary. Legacy
docker_sse_encryption_env docker_kms_master_encryption_env
## Set kms encryption from secrets if necessary. Override
docker_kms_secret_encryption_env
## Switch to user if applicable. ## Switch to user if applicable.
docker_switch_user "$@" docker_switch_user "$@"