Merge pull request #5 from datasci4health/development

Development
harena-lab · Apr 20, 2019 · 0c41ff9 · 0c41ff9
2 parents b2bdf10 + 8a80aa4
commit 0c41ff9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,6 @@
-# harena-cloud
+# harena-cloud
+
+just:
+```
+git clone https://github.com/datasci4health/harena-cloud && cd harena-cloud && sudo sh ./setup.sh
+```
diff --git a/configs/apache2/000-default.conf b/configs/apache2/000-default.conf
@@ -9,54 +9,54 @@
     ProxyRequests On
 
 
-
-
 #####################################################
-######          /case-notebook/latest          ######
+######            /case-notebook/v1            ######
 #####################################################
 
- Redirect  "/case-notebook/latest/web"  "/case-notebook/latest/web/"
- <Location "/case-notebook/latest/web/">
+ Redirect  "/case-notebook/v1/web"  "/case-notebook/v1/web/"
+ <Location "/case-notebook/v1/web/">
     ProxyPreserveHost on
     Options           +Indexes +FollowSymLinks
-    ProxyPass         http://localhost:8080/
-    ProxyPassReverse  http://localhost:8080/
+    ProxyPass         http://localhost:8081/
+    ProxyPassReverse  http://localhost:8081/
   </Location>
 
- Redirect  "/case-notebook/latest/server"  "/case-notebook/latest/server/"
- <Location "/case-notebook/latest/server/">
+ Redirect  "/case-notebook/v1/server"  "/case-notebook/v1/server/"
+ <Location "/case-notebook/v1/server/">
     ProxyPreserveHost on
     Options           +Indexes +FollowSymLinks
-    ProxyPass         http://localhost:8880/
-    ProxyPassReverse  http://localhost:8880/
+    ProxyPass         http://localhost:8881/
+    ProxyPassReverse  http://localhost:8881/
   </Location>
 
 
 
 
+
 #####################################################
-######            /case-notebook/v1            ######
+######          /case-notebook/latest          ######
 #####################################################
 
- Redirect  "/case-notebook/v1/web"  "/case-notebook/v1/web/"
- <Location "/case-notebook/v1/web/">
+ Redirect  "/case-notebook/latest/web"  "/case-notebook/latest/web/"
+ <Location "/case-notebook/latest/web/">
     ProxyPreserveHost on
     Options           +Indexes +FollowSymLinks
-    ProxyPass         http://localhost:8081/
-    ProxyPassReverse  http://localhost:8081/
+    ProxyPass         http://localhost:8080/
+    ProxyPassReverse  http://localhost:8080/
   </Location>
 
- Redirect  "/case-notebook/v1/server"  "/case-notebook/v1/server/"
- <Location "/case-notebook/v1/server/">
+ Redirect  "/case-notebook/latest/server"  "/case-notebook/latest/server/"
+ <Location "/case-notebook/latest/server/">
     ProxyPreserveHost on
     Options           +Indexes +FollowSymLinks
-    ProxyPass         http://localhost:8881/
-    ProxyPassReverse  http://localhost:8881/
+    ProxyPass         http://localhost:8880/
+    ProxyPassReverse  http://localhost:8880/
   </Location>
 
 
 
 
+
 #####################################################
 ######          /harena/logger/latest          ######
 #####################################################

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -12,15 +12,6 @@
      - 8081:80
      - 8881:8888
 
-  case-notebook-latest:
-   image: datasci4health/case-notebook:latest
-
-   container_name: case-notebook-latest
-   restart: always
-   ports:
-     - 8080:80
-     - 8880:8888
-
   watchtower:
     image: v2tec/watchtower
     volumes:

diff --git a/setup.sh b/setup.sh
@@ -5,6 +5,8 @@ sudo cp ./configs/apache2/000-default.conf /etc/apache2/sites-available/000-defa
 sudo cp ./configs/apache2/index.html /var/www/index.html 
 sudo systemctl restart apache2
 
+sudo docker-compose up -d
+
 sudo rm repositories -r
 mkdir   repositories  
 cd      repositories