Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-14 06:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/mastodon] Fix mastodon s3 (#30395)

Browse Source 
* Fix s3 region

Signed-off-by: Taylor Mansfield <lavahot@users.noreply.github.com>

* Fix alias variable name

Signed-off-by: Taylor Mansfield <lavahot@users.noreply.github.com>

* Fix check_empty_value

Signed-off-by: Taylor Mansfield <lavahot@users.noreply.github.com>

* Update bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh

Fix empty test

Signed-off-by: Taylor Mansfield <962444+lavahot@users.noreply.github.com>

* Update bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh

Fix missing }" in mastodon_s3_region assignment

Signed-off-by: Taylor Mansfield <962444+lavahot@users.noreply.github.com>

* Update bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh

Remove unset check

Signed-off-by: Taylor Mansfield <962444+lavahot@users.noreply.github.com>

---------

Signed-off-by: Taylor Mansfield <lavahot@users.noreply.github.com>
Signed-off-by: Taylor Mansfield <962444+lavahot@users.noreply.github.com>
This commit is contained in:
Taylor Mansfield
2023-04-20 00:09:33 -07:00
committed by GitHub
parent 361749da41
commit 01d5e9b62d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh
View File

@@ -111,7 +111,7 @@ mastodon_validate() {
check_empty_value "MASTODON_S3_HOSTNAME"
check_resolved_hostname "$MASTODON_S3_HOSTNAME"
check_valid_port "MASTODON_S3_PORT_NUMBER"
check_empty_value "MASTODON_S3_ALIAS"
check_empty_value "MASTODON_S3_ALIAS_HOST"
check_empty_value "MASTODON_S3_ENDPOINT"
check_empty_value "MASTODON_AWS_ACCESS_KEY_ID"
check_empty_value "MASTODON_AWS_SECRET_ACCESS_KEY"

3
bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh
View File

@@ -95,6 +95,7 @@ mastodon_env_vars=(
AWS_SECRET_ACCESS_KEY
AWS_ACCESS_KEY_ID
S3_ENDPOINT
S3_REGION
)
for env_var in "${mastodon_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@@ -247,7 +248,7 @@ MASTODON_AWS_ACCESS_KEY_ID="${MASTODON_AWS_ACCESS_KEY_ID:-"${AWS_ACCESS_KEY_ID:-
export MASTODON_AWS_ACCESS_KEY_ID="${MASTODON_AWS_ACCESS_KEY_ID:-}"
export AWS_ACCESS_KEY_ID="$MASTODON_AWS_ACCESS_KEY_ID"
export MASTODON_CFG_AWS_ACCESS_KEY_ID="$MASTODON_AWS_ACCESS_KEY_ID"
export MASTODON_S3_REGION="${MASTODON_S3_REGION:-us-east-1}"
export MASTODON_S3_REGION="${MASTODON_S3_REGION:-"${S3_REGION:-us-east-1}"}"
MASTODON_S3_ENDPOINT="${MASTODON_S3_ENDPOINT:-"${S3_ENDPOINT:-}"}"
export MASTODON_S3_ENDPOINT="${MASTODON_S3_ENDPOINT:-${MASTODON_S3_PROTOCOL}://${MASTODON_S3_HOSTNAME}:${MASTODON_S3_PORT_NUMBER}}"
export S3_ENDPOINT="$MASTODON_S3_ENDPOINT"