Merge pull request #28 from 540co/develop

Continuous Deployment Updates

.gitignore

@@ -4,3 +4,4 @@
 **/.tmp
 **/bower_components
 **/*.log
+**/dist

.travis.yml

@@ -8,8 +8,11 @@ before_script:
   - 'cd client'
   - 'npm install'
   - 'bower install'
+  - 'grunt build'
   - 'cd ../server'
   - 'npm install'
 script:
-  - cd ../client && npm test
-  - cd ../server && npm test
+  - cd ../client
+  - npm test
+  - cd ../server
+  - npm test

Dockerfile

@@ -0,0 +1,34 @@
+# To build:
+# 1. Install docker (http://docker.io)
+# 2. Checkout source: [email protected]:540co/ads-bpa.git
+# 3. Build container: docker build .
+
+FROM node:0.12.4
+MAINTAINER 540 Co LLC <[email protected]>
+
+# Environment Variables
+ENV SRC_PATH /src/dre
+ENV CLIENT_PATH $SRC_PATH/client
+ENV SERVER_PATH $SRC_PATH/server
+
+# App
+ADD . $SRC_PATH
+
+# Install dependencies
+WORKDIR $SRC_PATH
+RUN npm install -g bower grunt-cli mocha
+
+# Install client dependencies
+WORKDIR $CLIENT_PATH
+RUN npm install; bower install --allow-root; grunt build
+
+# Install server dependencies
+WORKDIR $SERVER_PATH
+RUN npm install
+
+# Expose port 3000 to host
+EXPOSE 3000
+
+# Start server
+WORKDIR $SERVER_PATH
+CMD ["npm", "start"]

client/Gruntfile.js

@@ -355,6 +355,11 @@ module.exports = function (grunt) {
           cwd: 'bower_components/bootstrap/dist',
           src: 'fonts/*',
           dest: '<%= yeoman.dist %>'
+        }, {
+          expand: true,
+          cwd: 'bower_components/font-awesome',
+          src: 'fonts/*',
+          dest: '<%= yeoman.dist %>'
         }]
       },
       styles: {

client/app/index.html

@@ -12,18 +12,17 @@
     <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.css" />
     <!-- endbower -->
     <!-- endbuild -->
-    <!-- build:css(.tmp) styles/main.css -->
+    <!-- build:css styles/main.css -->
     <link rel="stylesheet" href="styles/bootswatch.css" media="screen">
     <link rel="stylesheet" href="styles/bootstrap-switch.min.css" media="screen">
     <link rel="stylesheet" href="styles/dre.css" media="screen">
-
+    <!-- endbuild -->
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="bower_components/html5shiv/dist/html5shiv.js"></script>
       <script src="bower_components/respond/dest/respond.min.js"></script>
     <![endif]-->
-    <!-- endbuild -->
-
 
 
   </head>

docker-compose.yml

@@ -0,0 +1,8 @@
+web:
+  image: 540co/dre:latest
+  ports:
+    - "3000:3000"
+  links:
+    - mongo
+mongo:
+  image: mongo:3.0.4

server/app.js

@@ -25,7 +25,7 @@ app.use(cookieParser());
 
 app.use('/api', index);
 app.use('/api/reaction', reaction);
-app.use('/', express.static(__dirname + '/../client/app'));
+app.use('/', express.static(__dirname + '/../client/dist'));
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

server/config.js

@@ -1,5 +1,5 @@
 var config = {}
 
-config.mongo = "mongodb://localhost:27017/";
+config.mongo = "mongodb://mongo:27017/";
 
 module.exports = config;