Merge pull request #99 from lwm/fixup-gulp-assets

Get latest npm. Use it and run gulp watch.
cotech · Apr 2, 2018 · 6ad1ac1 · 6ad1ac1
2 parents f737cdb + fae4cfb
commit 6ad1ac1
Show file tree

Hide file tree

Showing 3 changed files with 3,096 additions and 1,568 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,7 @@ services:
 
   assets:
     build: docker/assets
+    command: sh -c "/download-images.sh && npm install && gulp && gulp watch"
     volumes:
       - .:/app
       - theme_node_modules:/app/web/app/themes/coop-tech-oowp-theme/node_modules

diff --git a/docker/assets/Dockerfile b/docker/assets/Dockerfile
@@ -3,7 +3,9 @@ FROM node:8.1.2
 RUN apt-get update
 RUN apt-get install -y apt-transport-https
 
+RUN yarn global add npm
+
 RUN npm install -g gulp
 
 ADD download-images.sh /download-images.sh
-RUN chmod +x /download-images.sh
+RUN chmod +x /download-images.sh