chore: remove tabs
This commit is contained in:
parent
e8f1186965
commit
0443ffc984
@ -1,35 +1,35 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
file_env() {
|
file_env() {
|
||||||
# 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
|
# 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
|
||||||
# https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
|
# https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
|
||||||
local var="$1"
|
local var="$1"
|
||||||
local fileVar="${var}_FILE"
|
local fileVar="${var}_FILE"
|
||||||
local def="${2:-}"
|
local def="${2:-}"
|
||||||
|
|
||||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
local val="$def"
|
local val="$def"
|
||||||
if [ "${!var:-}" ]; then
|
if [ "${!var:-}" ]; then
|
||||||
val="${!var}"
|
val="${!var}"
|
||||||
elif [ "${!fileVar:-}" ]; then
|
elif [ "${!fileVar:-}" ]; then
|
||||||
val="$(< "${!fileVar}")"
|
val="$(< "${!fileVar}")"
|
||||||
fi
|
fi
|
||||||
export "$var"="$val"
|
export "$var"="$val"
|
||||||
unset "$fileVar"
|
unset "$fileVar"
|
||||||
}
|
}
|
||||||
|
|
||||||
load_vars() {
|
load_vars() {
|
||||||
file_env "CMD_DB_PASSWORD"
|
file_env "CMD_DB_PASSWORD"
|
||||||
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
load_vars
|
load_vars
|
||||||
mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
|
mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,10 +39,10 @@ export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CM
|
|||||||
|
|
||||||
# 3wc: `source /docker-entrypoint2.sh -e` to load CMD_DB_URL for CLI scripts
|
# 3wc: `source /docker-entrypoint2.sh -e` to load CMD_DB_URL for CLI scripts
|
||||||
if [ ! "${1-}" == "-e" ]; then
|
if [ ! "${1-}" == "-e" ]; then
|
||||||
# 3wc: upstream ENTRYPOINT
|
# 3wc: upstream ENTRYPOINT
|
||||||
# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
|
# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
|
||||||
mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
|
mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
|
||||||
/usr/local/bin/docker-entrypoint.sh npm start
|
/usr/local/bin/docker-entrypoint.sh npm start
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set +eu
|
set +eu
|
||||||
|
Loading…
x
Reference in New Issue
Block a user