Fill in entrypoint, add abra.sh, fix environment
This commit is contained in:
parent
1ffd4e7736
commit
53d3046e01
|
@ -7,7 +7,6 @@ DOMAIN=grist.example.com
|
||||||
|
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
GRIST_SUPPORT_ANON=false
|
GRIST_SUPPORT_ANON=false
|
||||||
SECRET_GRIST_SESSION_SECRET_VERSION=v1
|
|
||||||
#GRIST_SANDBOX_FLAVOR=
|
#GRIST_SANDBOX_FLAVOR=
|
||||||
GRIST_SINGLE_ORG="yourorg"
|
GRIST_SINGLE_ORG="yourorg"
|
||||||
GRIST_ORG_IN_PATH=true
|
GRIST_ORG_IN_PATH=true
|
||||||
|
@ -15,3 +14,6 @@ COOKIE_MAX_AGE=7776000000
|
||||||
GRIST_FORCE_LOGIN=true
|
GRIST_FORCE_LOGIN=true
|
||||||
GRIST_HIDE_UI_ELEMENTS=billing,sendToDrive
|
GRIST_HIDE_UI_ELEMENTS=billing,sendToDrive
|
||||||
GRIST_DEFAULT_EMAIL=grist@example.com
|
GRIST_DEFAULT_EMAIL=grist@example.com
|
||||||
|
|
||||||
|
SECRET_GRIST_SESSION_SECRET_VERSION=v1
|
||||||
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
|
|
16
compose.yml
16
compose.yml
|
@ -5,14 +5,14 @@ services:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
environment:
|
environment:
|
||||||
- GRIST_DATABASE_URL=postgresql://${STACK_NAME}_db:5432/grist
|
|
||||||
- TYPEORM_DATABASE=grist
|
- TYPEORM_DATABASE=grist
|
||||||
- TYPEORM_TYPE=postgres
|
- TYPEORM_TYPE=postgres
|
||||||
- TYPEORM_USERNAME=grist
|
- TYPEORM_USERNAME=grist
|
||||||
|
- TYPEORM_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- REDIS_URL=redis://${STACK_NAME}_redis:6379
|
- REDIS_URL=redis://${STACK_NAME}_redis:6379
|
||||||
- GRIST_DATA_DIR=/var/grist-data
|
- GRIST_DATA_DIR=/var/grist-data
|
||||||
- GRIST_SUPPORT_ANON
|
- GRIST_SUPPORT_ANON
|
||||||
- SESSION_SECRET_FILE=/run/secrets/
|
- SESSION_SECRET_FILE=/run/secrets/session_secret
|
||||||
- GRIST_SANDBOX_FLAVOR=unsandboxed
|
- GRIST_SANDBOX_FLAVOR=unsandboxed
|
||||||
- APP_HOME_URL=https://${DOMAIN}
|
- APP_HOME_URL=https://${DOMAIN}
|
||||||
- APP_DOC_URL=https://${DOMAIN}
|
- APP_DOC_URL=https://${DOMAIN}
|
||||||
|
@ -24,6 +24,12 @@ services:
|
||||||
- GRIST_DEFAULT_EMAIL
|
- GRIST_DEFAULT_EMAIL
|
||||||
secrets:
|
secrets:
|
||||||
- session_secret
|
- session_secret
|
||||||
|
- db_password
|
||||||
|
configs:
|
||||||
|
- source: entrypoint_conf
|
||||||
|
target: /docker-entrypoint.sh
|
||||||
|
mode: 0555
|
||||||
|
entrypoint: /docker-entrypoint.sh
|
||||||
volumes:
|
volumes:
|
||||||
- grist_data:/persist
|
- grist_data:/persist
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -78,3 +84,9 @@ networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
|
|
||||||
|
configs:
|
||||||
|
entrypoint_conf:
|
||||||
|
name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
|
||||||
|
file: entrypoint.sh.tmpl
|
||||||
|
template_driver: golang
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
#!/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 TYPEORM_PASSWORD
|
||||||
|
file_env SESSION_SECRET
|
||||||
|
|
||||||
|
exec ./sandbox/run.sh $@
|
Loading…
Reference in New Issue