build scripts updated and bug fix

antoniocavalcante · Sep 5, 2018 · 4cd69dd · 4cd69dd
1 parent a980479
commit 4cd69dd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,10 +10,7 @@ services:
         "wsgi:app"
     volumes:
       - '$MUSTACHE_WORKSPACE:/app/workspace'
-      - '/tmp/.X11-unix:/tmp/.X11-unix'
       - '.:/usr/src/app:ro'
-    environment:
-      DISPLAY: ':0'
     ports:
       - '5000:5000'
     links:
@@ -26,11 +23,8 @@ services:
       user: nobody
       links:
           - redis
-      environment:
-        DISPLAY: ':0'
       volumes:
           - '$MUSTACHE_WORKSPACE:/app/workspace'
-          - '/tmp/.X11-unix:/tmp/.X11-unix'
           - '.:/usr/src/app:ro'
 
   redis:

diff --git a/mustache/static/js/dashboard/myplots.js b/mustache/static/js/dashboard/myplots.js
@@ -12,7 +12,7 @@ var globalColor = d3.interpolateViridis,
     medoids = {},
     ppg,
     ids,
-    fosc = [146, 150, 138, 122, 163, 121, 187, 180];
+    fosc = [];
 
 var barWidth = 6;
 var barPadding = 1.5;
@@ -1119,7 +1119,7 @@ function dendrogram() {
 
                     clusters = {}
                     node.each(function (d) {
-                        if (fosc.includes(+d.data.name)) {
+                        if (fosc.includes(+d.data.name) && +d.data.name != 0) {
                             clusters[d.data.name] = d;
                         }
                     })

diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,7 @@ redis==2.10.*
 numpy==1.15.1
 Cython==0.28.5
 flask_assets==0.12
+jsmin==2.2.2 
 hai==0.0.6
 # hdbscan==0.8.15
 matplotlib==2.2.3

diff --git a/run.sh b/run.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 export COMPOSE_PROJECT_NAME=mustache
-export MUSTACHE_WORKSPACE=
+export MUSTACHE_WORKSPACE=/home/csaba/Documents/datasets
 docker-compose up -d
-xhost +
 sleep 3
 xdg-open http://127.0.0.01:5000