Merge pull request #534 from ericchiang/fix-dockerfile

*: fix path to email config in dockerfile

Merge pull request #534 from ericchiang/fix-dockerfile
*: fix path to email config in dockerfile
263b933a · Eric Chiang · GitHub · d5744ab6 · dcc89083 · 263b933a
Commit 263b933a authored Aug 01, 2016 by Eric Chiang Committed by GitHub Aug 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.travis.yml .travis.yml +1 -0

Dockerfile Dockerfile +1 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

--- a/Dockerfile
+++ b/Dockerfile
@@ -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