Commit bb499788 authored by David Foucher's avatar David Foucher

Merge branch 'docker-deploy-authorisation' into 'master'

Add authorisations csv file deploy

See merge request !22
parents 8dc050d3 da75d496
Pipeline #2391 passed with stage
in 1 minute and 26 seconds
......@@ -12,3 +12,4 @@ htmlcov/
backoffice/node_modules/
backoffice/dist/
*.log
*.gz
......@@ -31,6 +31,8 @@ services:
- CATALOG_USER=${CATALOG_USER}
- CATALOG_KEY=${CATALOG_KEY}
- CATALOG_URL=${CATALOG_URL}
- GITLAB_TOKEN=${GITLAB_TOKEN}
- COMMIT_AUTHORIZED=${COMMIT_AUTHORIZED}
backoffice:
restart: unless-stopped
build:
......
......@@ -25,6 +25,8 @@ COPY trefle/etc/logrotate.d/gunicorn.logrotate /etc/logrotate.d/gunicorn
#deploy
COPY trefle/srv/gunicorn.conf.py ./gunicorn.conf.py
COPY trefle/srv/authorisations.csv ./authorisations.csv
COPY trefle/start.sh .
# setup virtualenv
......@@ -33,5 +35,4 @@ RUN pip install pip -U && \
pip install git+${TREFLE_GIT}@${TREFLE_VERSION}
#start
COPY trefle/start.sh .
ENTRYPOINT ./start.sh
......@@ -4,6 +4,10 @@ set -e
#start cron for logrotate
service cron start
cp authorisations.csv /usr/local/lib/python${PYTHON_VERSION}/site-packages/trefle/config/authorisations.csv
#start or reload gunicorn
if pgrep -x "gunicorn" > /dev/null
then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment