Merge branch 'provisioning' into 'master'

Provisioning

Closes #50 and #52

See merge request aic18/G6T4!41

diff --git a/Vagrantfile b/Vagrantfile
index 28d02e4f25165b98a26180e6fa14bef62f5c5786..9cc6e5365836f7d4f24e3cddc88693eecf90aa16 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,5 +22,6 @@ Vagrant.configure("2") do |config|
   config.vm.network "forwarded_port", guest: 8082, host: 8082
   config.vm.network "forwarded_port", guest: 8083, host: 8083
   config.vm.network "forwarded_port", guest: 8084, host: 8084
+  config.vm.network "forwarded_port", guest: 8085, host: 8085
 
 end

diff --git a/camunda-overlay/README.md b/camunda-overlay/README.md
index 66b07672664cfc248636f0960eeb11e4eebbd022..3463cddc9b6afa26724a76dc100ca310699a4cc4 100644 (file)
--- a/camunda-overlay/README.md
+++ b/camunda-overlay/README.md
@@ -15,7 +15,7 @@ Result should be available in Camunda Tasklist -> All Tasks
 
 ## Default login
 
-URI: http://localhost:8080/camunda/
+URI: http://localhost:8085/camunda/
 
 User: demo
 

diff --git a/camunda-overlay/camunda.py b/camunda-overlay/camunda.py
index ae76619e5d7e2853bd6d4ba771c2eca0b4d5884b..74eb8a7c77f7089a4cdac67abe69fd3eb1e8591a 100755 (executable)
--- a/camunda-overlay/camunda.py
+++ b/camunda-overlay/camunda.py
@@ -7,7 +7,7 @@ import requests
 import argparse
 from pprint import pprint
 
-CAMUNDA="http://localhost:8080/engine-rest/"
+CAMUNDA="http://localhost:8085/engine-rest/"
 
 def get_current_deployments(key = 'sentiment-analysis'):
     res = requests.get(CAMUNDA + "deployment")

diff --git a/docker-compose.yml b/g6t4
similarity index 84%
rename from docker-compose.yml
rename to g6t4
index 58b4096ef8e8f8a1c703b6f3c99c67767641b5c9..73fe4e892c90850a5ec5a081791791dfd12bd0af 100644 (file)
--- a/docker-compose.yml
+++ b/g6t4
@@ -4,7 +4,7 @@ services:
     build: ./camunda-overlay
     container_name: camunda
     ports:
-      - "8080:8080"
+      - "8085:8080"
     restart: always
     depends_on:
       - service-analysis
@@ -24,7 +24,6 @@ services:
     container_name: fallback
     ports:
       - "8082:8082"
-    restart: always
 
   service-reporting:
     build: ./service-reporting
@@ -39,3 +38,11 @@ services:
     ports:
       - "8084:8084"
     restart: always
+
+  service-website:
+    build: ./service-website
+    container_name: website
+    ports:
+      - "8080:8080"
+    depends_on:
+      - camunda

diff --git a/provision.sh b/provision.sh
index eeb2084993258fa520de8dffb7bc2c0a5c984b28..93af85855b3dad9eb932b0917e7c38d1a81f0003 100755 (executable)
--- a/provision.sh
+++ b/provision.sh
@@ -29,7 +29,7 @@ docker rm -f $(docker ps -aq) 2>/dev/null
 ###################
 # (re)compose all #
 ###################
-docker-compose up --build -d
+docker-compose -f g6t4 up --build -d
 
 ###########
 # cleanup #

diff --git a/service-website/Dockerfile b/service-website/Dockerfile
new file mode 100644 (file)
index 0000000..c394738
--- /dev/null
+++ b/service-website/Dockerfile
@@ -0,0 +1 @@
+FROM node

diff --git a/service-website/README.md b/service-website/README.md
new file mode 100644 (file)
index 0000000..ae4e96a
--- /dev/null
+++ b/service-website/README.md
@@ -0,0 +1,2 @@
+# Website Service
+