Merge remote-tracking branch 'upstream/master'

Author: andriyun

d7/Dockerfile

@@ -3,42 +3,41 @@ FROM mhart/alpine-node:7
 VOLUME /work
 WORKDIR /work
 
+ENV NPM_PACKAGES "node-sass \
+  webpack-dev-server \
+  webpack-stream \
+  babel-core \
+  babel-loader \
+  babel-plugin-transform-runtime \
+  babel-polyfill \
+  babel-preset-es2015 \
+  breakpoint-sass \
+  chroma-sass \
+  compass-importer \
+  del \
+  eslint \
+  glob \
+  gulp \
+  gulp-concat \
+  gulp-eslint \
+  gulp-if \
+  gulp-sass \
+  gulp-sass-lint \
+  gulp-sourcemaps \
+  gulp-uglify \
+  gulp.spritesmith \
+  normalize-scss \
+  sass-rem \
+  sass-toolkit \
+  script-loader \
+  susy \
+  typey \
+  yargs \
+  node-sass-asset-functions"
+
 RUN apk add --no-cache make g++ git python && \
     apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libsass && \
-    npm --unsafe-perm install -g \
-        node-sass \
-        webpack@1 \
-        webpack-dev-server \
-        webpack-stream \
-        babel-core \
-        babel-loader \
-        babel-plugin-transform-runtime \
-        babel-polyfill \
-        babel-preset-es2015 \
-        breakpoint-sass \
-        chroma-sass \
-        compass-importer \
-        del \
-        eslint \
-        glob \
-        gulp \
-        gulp-concat \
-        gulp-eslint \
-        gulp-if \
-        gulp-sass \
-        gulp-sass-lint \
-        gulp-sourcemaps \
-        gulp-uglify \
-        gulp.spritesmith \
-        LPGhatguy/node-sass-glob \
-        normalize-scss \
-        sass-rem \
-        sass-toolkit \
-        script-loader \
-        susy \
-        typey \
-        yargs \
-        node-sass-asset-functions && \
+    npm --unsafe-perm install -g webpack@1 LPGhatguy/node-sass-glob $NPM_PACKAGES && \
      apk del --purge make g++ python git
 
 COPY docker-entrypoint.sh /usr/local/bin/

d7/docker-entrypoint.sh

@@ -3,39 +3,6 @@
 # prevent conflicts with existing
 rm -rf node_modules
 
-/usr/bin/npm link \
-    node-sass \
-    webpack \
-    webpack-dev-server \
-    webpack-stream \
-    babel-core \
-    babel-loader \
-    babel-plugin-transform-runtime \
-    babel-polyfill \
-    babel-preset-es2015 \
-    breakpoint-sass \
-    chroma-sass \
-    compass-importer \
-    del \
-    eslint \
-    gulp \
-    glob \
-    gulp-concat \
-    gulp-eslint \
-    gulp-if \
-    gulp-sass \
-    gulp-sass-lint \
-    gulp-sourcemaps \
-    gulp-uglify \
-    gulp.spritesmith \
-    node-sass-glob \
-    normalize-scss \
-    sass-rem \
-    sass-toolkit \
-    script-loader \
-    susy \
-    typey \
-    yargs \
-    node-sass-asset-functions
+/usr/bin/npm link node-sass-glob webpack $NPM_PACKAGES
 
 exec "$@"

latest/Dockerfile

@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:6
+FROM mhart/alpine-node:7
 
 MAINTAINER Andy Postnikov
 

zen/Dockerfile

@@ -2,16 +2,15 @@ FROM skilldlabs/frontend:latest
 
 MAINTAINER Andy Postnikov
 
-RUN apk add --no-cache git \
-  && npm install -g \
-  bower \
+ENV NPM_PACKAGES "bower \
   breakpoint-sass \
   browser-sync \
   chroma-sass \
   del \
   eslint \
   event-stream \
   gulp-autoprefixer \
+  gulp-cached \
   gulp-eslint \
   gulp-if \
   gulp-load-plugins \
@@ -23,9 +22,13 @@ RUN apk add --no-cache git \
   gulp.spritesmith \
   kss \
   node-sass-import-once \
+  glob \
   sass-lint \
   support-for \
   typey \
-  zen-grids
+  zen-grids"
+
+RUN apk add --no-cache git \
+  && npm install -g $NPM_PACKAGES
 
 COPY docker-entrypoint.sh /usr/bin/

zen/docker-entrypoint.sh

@@ -3,31 +3,6 @@
 # prevent conflicts with existing
 rm -rf node_modules
 
-/usr/bin/npm link \
-  bower \
-  breakpoint-sass \
-  browser-sync \
-  chroma-sass \
-  del \
-  eslint \
-  event-stream \
-  gulp \
-  gulp-autoprefixer \
-  gulp-eslint \
-  gulp-if \
-  gulp-load-plugins \
-  gulp-rename \
-  gulp-replace \
-  gulp-sass \
-  gulp-sass-lint \
-  gulp-size \
-  gulp-sourcemaps \
-  gulp.spritesmith \
-  kss \
-  node-sass-import-once \
-  sass-lint \
-  support-for \
-  typey \
-  zen-grids
+/usr/bin/npm link gulp gulp-sass $NPM_PACKAGES
 
 exec "$@"