diff --git a/.envrc.sample b/.envrc.sample index 86797f7..a66b6db 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -29,6 +29,11 @@ export SHARED_LISTS_HOST=order.voedselcollectief.org export SHARED_LISTS_DB_NAME=sharedlists export SHARED_LISTS_USER=biobulkbende +export SMTP_DOMAIN=mail.autonomic.zone +export SMTP_ADDRESS=foodsoft@biobulkbende.org +export SMTP_PORT=2525 +export SMTP_USER_NAME=foodsoft + export DB_PASSWORD_VERSION=v1 export DB_ROOT_PASSWD_VERSION=v1 export SHARED_LISTS_DB_PASSWD_VERSION=v1 diff --git a/compose.yml b/compose.yml index ca0c955..eb53fb3 100644 --- a/compose.yml +++ b/compose.yml @@ -35,18 +35,23 @@ services: - FOODCOOP_STREET - FOODCOOP_TIME_ZONE - FOODCOOP_ZIP_CODE + - MAILER_PREFIX=foodsoft+ - MYSQL_HOST=db - MYSQL_NAME=foodsoft - MYSQL_PORT=3306 - MYSQL_USER=foodsoft - QUEUE=foodsoft_notifier - - REDIS_URL=redis://redis:6379 + - REDIS_URL=redis://cache:6379 - SECRET_KEY_BASE_FILE=/var/run/secrets/secret_key_base - SHARED_LISTS_DB_NAME - SHARED_LISTS_DB_TYPE - SHARED_LISTS_HOST - SHARED_LISTS_USER + - SMTP_ADDRESS + - SMTP_DOMAIN - SMTP_PASSWORD_FILE=/var/run/secrets/smtp_passwd + - SMTP_PORT + - SMTP_USER_NAME healthcheck: test: ["CMD", "curl", "-f", "http://localhost:3000"] interval: 15s @@ -95,6 +100,8 @@ services: cache: image: "redis:6" + networks: + - internal networks: internal: diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 1fee611..706f7d3 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -33,11 +33,16 @@ reuse() { fi } +db_setup() { + rake db:setup +} + main() { set -eu reuse load_vars + db_setup exec "$@" }