Compare commits

...

2 Commits

Author SHA1 Message Date
decentral1se 85fa6ee068
Use better volume name 2021-06-26 20:47:42 +02:00
decentral1se e21c2484d7
Use /bin/sh for entrypoint (no bash) 2021-06-26 20:47:35 +02:00
2 changed files with 5 additions and 24 deletions

View File

@ -26,7 +26,6 @@ services:
networks:
- proxy
- internal
command: server start
entrypoint: /entrypoint.sh
volumes:
- app:/gotosocial/storage
@ -50,7 +49,7 @@ services:
secrets:
- db_password
volumes:
- db:/var/lib/postgresql/data
- postgres:/var/lib/postgresql/data
networks:
- internal
deploy:
@ -75,4 +74,4 @@ configs:
volumes:
app:
db:
postgres:

View File

@ -1,25 +1,7 @@
#!/bin/bash
#!/bin/sh
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"
}
export GTS_DB_PASSWORD=$(cat "$GTS_DB_PASSWORD_FILE")
file_env "GTS_DB_PASSWORD"
exec "$@"
/gotosocial/gotosocial server start