Merge pull request #82 from uc-cdis/fix/docker

fix(docker): ignore node_modules
uc-cdis · Jul 18, 2017 · b38df78 · b38df78
2 parents f5876f3 + 38693af
commit b38df78
Show file tree

Hide file tree

Showing 3 changed files with 3,771 additions and 501 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ script:
     - npm test
     - |
       set -e
+      git clean -f -fxd :/
       docker build --cache-from quay.io/cdis/bpa-data-portal:master --build-arg APP=bpa -t quay.io/cdis/bpa-data-portal:${TRAVIS_BRANCH/\//_} .
       docker build --cache-from quay.io/cdis/bpa-data-portal:master --build-arg APP=edc --build-arg BASENAME="/portal/" -t quay.io/cdis/edc-data-portal:${TRAVIS_BRANCH/\//_} .
       docker build --cache-from quay.io/cdis/bpa-data-portal:master --build-arg APP=acct -t quay.io/cdis/acct-data-portal:${TRAVIS_BRANCH/\//_} .