Merge pull request #1 from mjhea0/sans-docker

added microservices
mjhea0 · Apr 17, 2017 · 09984a4 · 09984a4
2 parents 2756fc2 + 257302f
commit 09984a4
Show file tree

Hide file tree

Showing 64 changed files with 1,443 additions and 472 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .DS_Store
 node_modules/
 npm-debug.log
-*.env
+_ignore
diff --git a/app/.jshintrc → .jshintrc b/app/.jshintrc → .jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -14,9 +14,14 @@ before_install:
 
 before_script:
   - docker-compose up --build -d
+  - docker-compose run users-service knex migrate:latest --env development --knexfile app/knexfile.js
+  - docker-compose run users-service knex seed:run --env development --knexfile app/knexfile.js
+  - docker-compose run locations-service knex migrate:latest --env development --knexfile app/knexfile.js
+  - docker-compose run locations-service knex seed:run --env development --knexfile app/knexfile.js
 
 script:
-  - docker-compose run web npm test
+  - docker-compose run users-service npm test
+  - docker-compose run locations-service npm test
 
 after_script:
   - docker-compose down
diff --git a/README.md b/README.md
diff --git a/app/.dockerignore b/app/.dockerignore
diff --git a/app/Dockerfile b/app/Dockerfile
diff --git a/app/src/db/Dockerfile b/app/src/db/Dockerfile
diff --git a/app/src/db/create.sql b/app/src/db/create.sql
diff --git a/app/src/db/migrations/20170312163839_jobs.js b/app/src/db/migrations/20170312163839_jobs.js
diff --git a/app/src/db/queries.js b/app/src/db/queries.js
diff --git a/app/src/db/seeds/01_jobs.js b/app/src/db/seeds/01_jobs.js
diff --git a/app/src/routes/jobs.js b/app/src/routes/jobs.js