Merge pull request lambdaspace#19 from alexdor/master

Add gulp update, use alpine node, update haproxy

Gulp-Dockerfile

@@ -0,0 +1,30 @@
+############################################################
+# Dockerfile for gulp and bower
+############################################################
+
+# Use the alpine Node.js base image
+FROM node:8-alpine
+
+# File Author / Maintainer
+MAINTAINER alexdor
+
+################## BEGIN INSTALLATION ######################
+
+# Update repositories and install git
+RUN apk update && apk add git
+
+# Clone repo
+RUN git clone https://github.com/lambdaspace/new_website.git
+
+RUN yarn global add bower gulp
+
+# Install dependencies
+WORKDIR new_website
+# ADD ./node_modules node_modules/
+# ADD ./src/components src/components/
+RUN yarn install
+RUN bower install --allow-root
+
+################## INSTALLATION END ######################
+
+CMD /usr/local/bin/gulp --production /new_website/

MinisterIN-Dockerfile

@@ -2,17 +2,16 @@
 # Dockerfile to build the MinisterIN service
 ############################################################
 
-# Use the slim Node.js base image
-FROM node:7.7-slim
+# Use the alpine Node.js base image
+FROM node:8-alpine
 
 # File Author / Maintainer
 MAINTAINER AEtherC0r3
 
 ################## BEGIN INSTALLATION ######################
 
 # Update repositories and install git
-RUN apt-get update
-RUN apt-get install -y git
+RUN apk update && apk add git
 
 # Clone repo
 RUN git clone https://github.com/lambdaspace/MinisterIN.git

docker-compose.yml

@@ -14,7 +14,10 @@ services:
     volumes:
       - /etc/letsencrypt/live/www.lambdaspace.gr:/etc/letsencrypt/live/www.lambdaspace.gr:ro
       - /etc/letsencrypt/archive/www.lambdaspace.gr:/etc/letsencrypt/archive/www.lambdaspace.gr:ro
+      - /tmp/dist:/usr/share/nginx/html/dist:ro
     restart: always
+    depends_on:
+      - gulp
 
   redirector:
     image: nginx:stable-alpine
@@ -28,7 +31,7 @@ services:
     restart: always
 
   proxy:
-    image: haproxy:1.6-alpine
+    image: haproxy:1.7-alpine
     links:
       - website
       - redirector
@@ -60,3 +63,11 @@ services:
     ports:
       - "8883:8883"
     restart: always
+
+  gulp:
+    build:
+      context: .
+      dockerfile: Gulp-Dockerfile
+    volumes:
+      - /etc/hosts:/etc/hosts:ro
+      - /tmp/dist:/new_website/dist