Merge 2068f9c into e3ef78e

.dockerignore

@@ -7,9 +7,6 @@ logs
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
-# Coverage directory used by tools like istanbul
-coverage
-
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
@@ -32,13 +29,4 @@ desktop.ini
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules
 
-app
-config
-docs
-test
-scripts
-*.md
-*.yml
 LICENSE
-build-docker-container.sh
-run-docker-container.sh

Dockerfile

@@ -1,12 +1,21 @@
-FROM alpine:3.2
+FROM mhart/alpine-node:0.10
 
-ADD ./dist /var/www/hmda-pilot
-COPY ./docker-files /tmp/scripts
+WORKDIR /usr/local/app
 
-# Use a custom build script instead of messy chained together RUN
-# or multiple RUN statements that add bloat to the image
-RUN /tmp/scripts/run.sh
+COPY . .
+
+RUN docker-files/run.sh
+
+USER notroot
+
+RUN docker-files/run-node.sh
+
+USER root
+
+RUN cp -r dist/ /var/www/hmda-pilot/
 
 EXPOSE 80 443
+
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["nginx"]
+
+CMD ["nginx"]

Gruntfile.js

@@ -289,17 +289,20 @@ module.exports = function (grunt) {
     //   dist: {}
     // },
 
-    imagemin: {
-      dist: {
-        files: [{
-          expand: true,
-          cwd: '<%= yeoman.app %>/images',
-          src: '{,*/}*.{png,jpg,jpeg,gif}',
-          dest: '<%= yeoman.dist %>/images'
-        }]
-      }
-    },
-
+// Removed due to failure to build on alpine
+// Currently only saves ~7kb    
+// Could pre-minify images when they're checked in
+//
+//    imagemin: {
+//      dist: {
+//        files: [{
+//          expand: true,
+//          cwd: '<%= yeoman.app %>/images',
+//          src: '{,*/}*.{png,jpg,jpeg,gif}',
+//          dest: '<%= yeoman.dist %>/images'
+//        }]
+//      }
+//    },
     svgmin: {
       dist: {
         files: [{
@@ -383,7 +386,7 @@ module.exports = function (grunt) {
       ],
       dist: [
         'copy:styles',
-        'imagemin',
+       // 'imagemin',
         'svgmin'
       ]
     },

docker-files/run-node.sh

@@ -0,0 +1,4 @@
+#Install node deps and build
+npm install
+
+grunt build:docker

docker-files/run.sh

@@ -1,14 +1,22 @@
 #!/bin/sh
 
 ##### add dependencies
-apk --update add nginx sed
-chown -R nginx:nginx /var/www
+apk --update add nginx sed make gcc g++ python git
 
 ##### Move some things into place
-cp -f /tmp/scripts/nginx.conf /etc/nginx
-cp -f /tmp/scripts/hmda-pilot.conf.tmpl /etc/nginx
-cp -f /tmp/scripts/entrypoint.sh /
-cp -f /tmp/scripts/update-nginx-config.sh /etc/nginx
+cp -f docker-files/nginx.conf /etc/nginx
+cp -f docker-files/hmda-pilot.conf.tmpl /etc/nginx
+cp -f docker-files/entrypoint.sh /
+cp -f docker-files/update-nginx-config.sh /etc/nginx
+
+##### Set permissions
+mkdir -p /var/www/
+chown -R nginx:nginx /var/www
+adduser -S notroot
+chown -R notroot /usr/local/app
+
+##### Install global modules
+npm install -g grunt-cli
 
 ##### Clean up
-rm -rf /var/cache/apk/* /tmp/scripts
+rm -rf /var/cache/apk/*

package.json

@@ -54,7 +54,6 @@
     "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-cssmin": "^0.9.0",
     "grunt-contrib-htmlmin": "^0.3.0",
-    "grunt-contrib-imagemin": "^0.9.2",
     "grunt-contrib-jshint": "^0.11.0",
     "grunt-contrib-less": "^0.12.0",
     "grunt-contrib-uglify": "^0.4.0",
@@ -69,7 +68,7 @@
     "grunt-newer": "^0.7.0",
     "grunt-ng-annotate": "^0.8.0",
     "grunt-protractor-runner": "^2.0.0",
-    "grunt-replace": "^0.8.0",
+    "grunt-replace": "^0.11.0",
     "grunt-svgmin": "^0.4.0",
     "grunt-usemin": "^2.1.1",
     "grunt-wiredep": "^1.7.0",

test/spec/modules/hmdaFilters.js

@@ -112,7 +112,7 @@ describe('Filters: hmdaFilters', function() {
 
             Date.prototype.getMonthFormatted = function() {
                 var month = this.getMonth();
-                return month < 10 ? '0' + (month + 1) : month + 1;
+                return month < 9 ? '0' + (month + 1) : month + 1;
             };
 
             Date.prototype.getDateFormatted = function() {