Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change all the configuration variables to ENVIRONMENT VARS.

Browse Source 
Following 12factor principle for app development, all the configuration
variables for the docker images can now be setup using environment vars.

The default values are set using the run.sh script in both mailman-web
and mailman-core containers.

Mailman-core is now run by "run.sh" which traps SIGTERM and performs
mailman stop for graceful exit of mailman core.
This commit is contained in:
Abhilash Raj
2017-04-07 00:52:48 -07:00
parent 9a0421ea6d
commit 235e076e63
4 changed files with 254 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
web/assets/run.sh
View File

@@ -1,29 +1,8 @@
#! /bin/bash
set -e
# Check if $DATABASE_URL is defined, if not, use a standard sqlite database.
#
# If the $DATABASE_URL is defined and is postgres, check if it is available
# yet. Do not start the container before the postgresql boots up.
#
# If the $DATABASE_URL is defined and is mysql, check if the database is
# available before the container boots up.
#
# TODO: Check the database type and detect if it is up based on that. For now,
# assume that postgres is being used if DATABASE_URL is defined.
if [[ -z "$DATABASES_URL" ]]; then
echo "$DATABASE_URL is not defined. Using sqlite database..."
DATABASE_URL="sqlite:///opt/mailman-web-data/database/mailmanweb.db"
DATABASE_TYPE='sqlite'
if [[ ! -e "/opt/mailman-web-data/database" ]]; then
mkdir -p /opt/mailman-web-data/database/
fi
else
DATABASE_TYPE='postgres'
wait_for_postgres()
fi
function wait_for_postgres {
function wait_for_postgres () {
# Check if the postgres database is up and accepting connections before
# moving forward.
# TODO: Use python's psycopg2 module to do this in python instead of
@@ -35,7 +14,7 @@ function wait_for_postgres {
>&2 echo "Postgres is up - continuing"
}
function check_or_create {
function check_or_create () {
# Check if the path exists, if not, create the directory.
if [[ ! -e dir ]]; then
echo "$1 does not exist, creating ..."
@@ -43,6 +22,38 @@ function check_or_create {
fi
}
# function postgres_ready(){
# python << END
# import sys
# import psycopg2
# try:
# conn = psycopg2.connect(dbname="$POSTGRES_DB", user="$POSTGRES_USER", password="$POSTGRES_PASSWORD", host="postgres")
# except psycopg2.OperationalError:
# sys.exit(-1)
# sys.exit(0)
# END
# }
# Check if $DATABASE_URL is defined, if not, use a standard sqlite database.
#
# If the $DATABASE_URL is defined and is postgres, check if it is available
# yet. Do not start the container before the postgresql boots up.
#
# If the $DATABASE_URL is defined and is mysql, check if the database is
# available before the container boots up.
#
# TODO: Check the database type and detect if it is up based on that. For now,
# assume that postgres is being used if DATABASE_URL is defined.
if [[ ! -v DATABASE_URL ]]; then
echo "DATABASE_URL is not defined. Using sqlite database..."
export DATABASE_URL=sqlite://mailmanweb.db
export DATABASE_TYPE='sqlite'
else
export DATABASE_TYPE='postgres'
wait_for_postgres
fi
# Check if we are in the correct directory before running commands.
if [[ ! $(pwd) == '/opt/mailman-web' ]]; then
echo "Running in the wrong directory...switching to /opt/mailman-web"
@@ -57,7 +68,7 @@ if [[ ! -e /opt/mailman-web-data/logs/mailmanweb.log ]]; then
touch /opt/mailman-web-data/logs/mailmanweb.log
fi
if [[ ! -e /opt/mailman-web-data/logs/mailmanweb.log ]]; then
if [[ ! -e /opt/mailman-web-data/logs/uwsgi.log ]]; then
echo "Creating log file for uwsgi.."
touch /opt/mailman-web-data/logs/uwsgi.log
fi
@@ -84,11 +95,18 @@ python manage.py migrate
# It can also point to a logging daemon accessible at a URL.
if [[ -z "$UWSGI_LOG_URL" ]]; then
echo "No $UWSGI_LOG_URL defined, logging uwsgi to /opt/mailman-web-data/logs/uwsgi.log ..."
UWSGI_LOG_URL='/opt/mailman-web-data/logs/uwsgi.log'
export UWSGI_LOG_URL='/opt/mailman-web-data/logs/uwsgi.log'
if [[ ! -e "$UWSGI_LOG_URL" ]]; then
touch "$UWSGI_LOG_URL"
fi
fi
if [[ -z "$UWSGI_WSGI_FILE" ]]; then
export UWSGI_WSGI_FILE="wsgi.py"
export UWSGI_HTTP=":8000"
export UWSGI_WORKERS=2
export UWSGI_THREADS=4
fi
# Run the web server.
uwsgi --http-auto-chunked --http-keepalive --logto "$UWSGI_LOG_URL"