From c03c64c3a241dd167a7de90e5caecdea54f52412 Mon Sep 17 00:00:00 2001
From: Buddy Sandidge <buddy.sandidge@gmail.com>
Date: Tue, 24 Feb 2015 22:48:56 -0800
Subject: [PATCH] Update Dockerfile to make self contained image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 • Don't include vim swap files
 • Remove unused path from path environment variable
 • Add npm build script to just build assets
 • Have default command be running the deck
---
 .dockerignore |  5 +++--
 Dockerfile    | 13 ++++++++-----
 Gruntfile.js  |  3 ++-
 package.json  |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 219e74d..f2c1539 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
-scripts/*
-node_modules/*
+./scripts
+*.swp
+./node_modules
diff --git a/Dockerfile b/Dockerfile
index 4bbce0b..1464565 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,16 +55,19 @@ RUN mkdir -p /opt/node && \
 
 RUN cd /usr/local/bin/ && ln -s phantomjs-1.9.8 phantomjs
 
-ENV PATH /opt/node/bin:/opt/phantom-talk/node_modules/.bin:$PATH
+ENV PATH /opt/node/bin:$PATH
 ENV PHANTOMJS_BIN /usr/local/bin/phantomjs
 
-# Mount this in the docker container
-VOLUME ["/opt/phantom-talk"]
 WORKDIR /opt/phantom-talk
-COPY package.json /opt/phantom-talk/package.json
-COPY README.md /opt/phantom-talk/README.md
+
+COPY ./package.json /opt/phantom-talk/package.json
+COPY ./README.md /opt/phantom-talk/README.md
 RUN ["npm", "install"]
+ADD . /opt/phantom-talk
+
+RUN ["npm", "run", "build"]
 EXPOSE 8000
 EXPOSE 8001
 EXPOSE 35729
 ENTRYPOINT ["npm"]
+CMD ["run", "deck"]
diff --git a/Gruntfile.js b/Gruntfile.js
index 16ce331..17ed384 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -155,7 +155,8 @@ module.exports = function (grunt) {
   grunt.registerTask('dev', ['default']);
   grunt.registerTask('style', ['compass', 'clean:compass', 'clean:tmp']);
   grunt.registerTask('js', ['handlebars', 'copy', 'requirejs', 'test']);
-  grunt.registerTask('build', ['clean:app', 'style', 'js', 'watch']);
+  grunt.registerTask('build', ['static', 'watch']);
+  grunt.registerTask('static', ['clean:app', 'style', 'js']);
 
   grunt.registerTask('default', ['run-deck', 'karma:server', 'build']);
 };
diff --git a/package.json b/package.json
index 760ed96..28b3cdb 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "main": "lib/deck.js",
   "scripts": {
     "dev": "grunt dev",
+    "build": "grunt static",
     "deck": "./bin/deck",
     "test": "grunt test"
   },