Merge pull request #534 from ericchiang/fix-dockerfile

*: fix path to email config in dockerfile
This commit is contained in:
Eric Chiang 2016-08-01 15:44:07 -07:00 committed by GitHub
commit 263b933a34
2 changed files with 2 additions and 1 deletions

View file

@ -33,6 +33,7 @@ script:
- sudo sh -c 'echo "127.0.0.1 tlstest.local" >> /etc/hosts'
- ./test-functional
- DEX_TEST_DSN="sqlite3://:memory:" ./test-functional
- ./build-docker
deploy:
provider: script

View file

@ -9,4 +9,4 @@ ADD static/html/* $DEX_WORKER_HTML_ASSETS
ENV DEX_WORKER_EMAIL_TEMPLATES /opt/dex/email/
ADD static/email/* $DEX_WORKER_EMAIL_TEMPLATES
ADD static/fixtures/emailer.json.sample $DEX_WORKER_EMAIL_TEMPLATES/emailer.json
ADD static/fixtures/emailer.json $DEX_WORKER_EMAIL_TEMPLATES/emailer.json