Merge pull request #85 from oslabs-beta/rydang/travis

moved travis file

Author: mylee1995

.travis.yml

@@ -0,0 +1,12 @@
+services:
+  - docker
+script:
+  - docker-compose up --abort-on-container-exit
+deploy:
+  provider: script
+  skip_cleanup: true
+  on:
+    branches:
+      only:
+        - dev
+        - master

docker-compose.yml

@@ -1,9 +1,9 @@
-version: '3'
+version: '2'
 services:
   test:
     image: reacttt/test-lint
     container_name: reacttt-test-lint
     volumes:
       - .:/usr/src/app
       - /usr/src/app/node_modules
-    command: bash -c "npm run lint && npm test"
+    command: npm run docker-test-lint

package.json

@@ -8,7 +8,8 @@
     "test": "jest --verbose --coverage --watchAll",
     "lint": "eslint --ext .js --ext .jsx src",
     "docker-build": "docker build -t reacttt/test-lint .",
-    "docker-check": "docker-compose up --abort-on-container-exit"
+    "docker-check": "docker-compose up --abort-on-container-exit",
+    "docker-test-lint": "eslint --ext .js --ext .jsx src && jest --verbose"
   },
   "keywords": [
     "react",