diff --git a/compose.yml b/compose.yml index 18532c3..59192d5 100644 --- a/compose.yml +++ b/compose.yml @@ -26,7 +26,6 @@ services: networks: - proxy - internal - command: server start entrypoint: /entrypoint.sh volumes: - app:/gotosocial/storage diff --git a/entrypoint.sh b/entrypoint.sh index e06a0ef..84f3270 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -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