SMTL

Die Stadtmeistersteilerliste und das Anmeldeformular - SK Langen e.V.
git clone git://git.oshgnacknak.de/SMTL.git
Log | Files | Refs | README

commit 1683d5d0fc913de7b2650a4724dc600b2645d9ce
parent cc945402ec3150eb38d79fca46c6fd1a6ae2fcde
Author: Oshgnacknak <osh@oshgnacknak.de>
Date:   Sun, 18 Aug 2019 13:50:31 +0200

Support email also in docker

Diffstat:
MDockerfile | 15++++++++++++++-
Mconfig.py.dist | 1+
Menv_config.py | 12++++++++++++
Msmtl/templates/player_table.html | 2+-
4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile @@ -1,5 +1,18 @@ FROM python:3.7 +ENV SECRET_KEY +ENV SQLALCHEMY_DATABASE_URI + +ENV EMAIL_HOST +ENV EMAIL_PORT 587 +ENV EMAIL_ADDR +ENV EMAIL_USER +ENV EMAIL_PASSWORD + +ENV DEBUG False +ENV HOST 0.0.0.0 +ENV POST 5000 + WORKDIR /usr/src/app COPY requirements.txt ./ @@ -10,5 +23,5 @@ COPY . . EXPOSE 5000 -CMD [ "python", "./run.py" ] +ENTRYPOINT [ "python", "./run.py" ] diff --git a/config.py.dist b/config.py.dist @@ -22,6 +22,7 @@ email_config = { 'HOST': 'some_host', 'PORT': 587, 'ADDR': 'some_mail', + 'USER' :'some_user', # None for ADDR 'PASSWORD': 'some_password' } diff --git a/env_config.py b/env_config.py @@ -7,6 +7,18 @@ app_config = { } +if 'EMAIL_HOST' in environ: + email_config = { + 'HOST': environ.get('EMAIL_HOST'), + 'PORT': int(environ.get('EMAIL_PORT', 587)), + 'ADDR': environ.get('EMAIL_ADDR'), + 'USER': environ.get('EMAIL_USER'), + 'PASSWORD': environ.get('EMAIL_PASSWORD') + } +else: + email_config = {} + + run_config = { 'DEBUG': environ.get('DEBUG', False), 'HOST': environ.get('HOST', '0.0.0.0'), diff --git a/smtl/templates/player_table.html b/smtl/templates/player_table.html @@ -11,7 +11,7 @@ } #player_table tr:nth-child(2n) { - background: #97d9e5; + background: lightgray; } #player_table td {