forked from coop-cloud/outline
fix: use sh, only thing available
This commit is contained in:
parent
b451550a61
commit
6bfb2ac153
|
@ -44,7 +44,6 @@ services:
|
|||
- TEAM_LOGO
|
||||
- URL=https://$DOMAIN
|
||||
- UTILS_SECRET_FILE=/run/secrets/utils_secret
|
||||
command: yarn start
|
||||
entrypoint: /docker-entrypoint.sh
|
||||
deploy:
|
||||
labels:
|
||||
|
|
|
@ -1,32 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
file_env() {
|
||||
local var="$1"
|
||||
local fileVar="${var}_FILE"
|
||||
local def="${2:-}"
|
||||
|
||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local val="$def"
|
||||
|
||||
if [ "${!var:-}" ]; then
|
||||
val="${!var}"
|
||||
elif [ "${!fileVar:-}" ]; then
|
||||
val="$(< "${!fileVar}")"
|
||||
fi
|
||||
|
||||
export "$var"="$val"
|
||||
unset "$fileVar"
|
||||
}
|
||||
|
||||
file_env "AWS_SECRET_KEY"
|
||||
file_env "OIDC_CLIENT_SECRET"
|
||||
file_env "UTILS_SECRET"
|
||||
file_env "DATABASE_PASSWORD"
|
||||
#!/bin/sh
|
||||
|
||||
export AWS_SECRET_KEY=$(cat /run/secrets/aws_secret_key)
|
||||
export OIDC_CLIENT_SECRET=$(cat /run/secrets/oidc_client_secret)
|
||||
export UTILS_SECRET=$(cat /run/secrets/utils_secret)
|
||||
export SECRET_KEY=$(cat /run/secrets/secret_key)
|
||||
export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
|
||||
export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline"
|
||||
|
||||
/usr/local/bin/yarn start "$@"
|
||||
|
|
Loading…
Reference in New Issue