From 090c848f0be26e38ff324d3964b5aafb42aca613 Mon Sep 17 00:00:00 2001
From: Gotier <gothar12@hotmail.com>
Date: Wed, 15 Nov 2017 17:39:36 +0100
Subject: [PATCH] add dockerfile 1.1.0

correct shell to install dependencies
---
 docker/1.1.0/Dockerfile         | 15 +++++++++++++++
 docker/1.1.0/docker-compose.yml | 10 ++++++++++
 installDependencies.sh          |  3 +--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 docker/1.1.0/Dockerfile
 create mode 100644 docker/1.1.0/docker-compose.yml

diff --git a/docker/1.1.0/Dockerfile b/docker/1.1.0/Dockerfile
new file mode 100644
index 0000000..060a7c2
--- /dev/null
+++ b/docker/1.1.0/Dockerfile
@@ -0,0 +1,15 @@
+FROM alpine:latest
+MAINTAINER nicodeur <nico.deblock@gmail.com>
+
+RUN apk update && apk add --update git nodejs nodejs-npm tar && npm install npm@latest -g && rm -rf /var/cache/apk/*
+
+RUN wget https://github.com/nicodeur/QualityDashboard/archive/1.1.0.tar.gz && tar xzvf 1.1.0.tar.gz -C /opt/qualityReport
+
+RUN  cd /opt/qualityReport && chmod 755 installDependencies.sh && ./installDependencies.sh
+
+WORKDIR /opt/qualityReport
+
+CMD chmod 755 start.sh && chmod 755 front/start.sh  && chmod 755 server/start.sh && chmod 755 stop.sh && chmod 755 restart.sh &&\
+  ./start.sh && tail -f logs/server.log
+
+EXPOSE 8085 8086
diff --git a/docker/1.1.0/docker-compose.yml b/docker/1.1.0/docker-compose.yml
new file mode 100644
index 0000000..56540b4
--- /dev/null
+++ b/docker/1.1.0/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '2.1'
+services:
+  quality-report:
+    build: .
+    ports:
+      - "8085:8085"
+      - "8086:8086"
+    volumes:
+      - ./localdata/log:/opt/qualityReport/log
+      - ./localdata/conf:/opt/qualityReport/front/conf
diff --git a/installDependencies.sh b/installDependencies.sh
index 8fd734b..7c5800a 100644
--- a/installDependencies.sh
+++ b/installDependencies.sh
@@ -13,7 +13,6 @@ echo "";
 npm install http-server -g
   
   
-
 cd ../server
 
 echo "";
@@ -23,7 +22,7 @@ echo "-------------------------------------------------"
 echo "";
   
 npm install
-
+npm install nodemon -g
 
 echo "";
 echo "-------------------------------------------------";