Merge branch 'release/0.21.4'

Author: mblaschke

CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 ### Changed
 - Improved entrypoint startup time
 - Removed entrypoint ansible provisioning if not needed
+- Added java-jre and latest npm for samson-deployment
 
 ## [0.20.0] - 2016-02-24
 ### Added

samson-deployment/latest/Dockerfile

@@ -112,7 +112,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \
     && pip install docker-compose
 
 # NPM stack
-RUN export DEBIAN_FRONTEND=noninteractive && set -x \
+RUN npm install -g npm \
+    && npm update -g \
     && npm install -g gulp \
     && npm install -g grunt-cli \
     && npm install -g bower \