Merge pull request #66 from zitrosolrac/trimmedPackageJson

Trimmed package json

Author: guzman-raphael

docker-compose-base.yml

@@ -33,15 +33,16 @@ services:
   ibl-navigator:
     <<: *net
     # image: registry.vathes.com/ibl-navigator/frontend:v0.4.2 # for internal demo
-    image: registry.vathes.com/ibl-navigator/frontend:v0.2.5-public # for public demo
+    image: registry.vathes.com/ibl-navigator/frontend:v0.2.6-public # for public demo
     healthcheck:
       test: curl --fail http://localhost:9000 || exit 1
       timeout: 3s
       retries: 20
   ibl-node-server:
     <<: *net
+    platform: linux/amd64
     # image: registry.vathes.com/ibl-navigator/node-server:v0.3.0 # for internal demo
-    image: registry.vathes.com/ibl-navigator/node-server:v0.2.0-public # for public demo
+    image: registry.vathes.com/ibl-navigator/node-server:v0.2.1-public # for public demo
     environment:
     - NODE_ENV=development
     - DEMO_USERNAME=ibluser
@@ -72,7 +73,7 @@ services:
     #     condition: service_healthy
   nginx:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.0.18
     environment:
       - ADD_zfrontend_TYPE=REST
       - ADD_zfrontend_ENDPOINT=ibl-navigator:9000

docker-compose-dev.yml

@@ -35,6 +35,9 @@ services:
       service: ibl-node-server
     image: ibl-node-server:v0.0.0
     # command: nodemon /src/server.js
+    # command: npm test
+    ports:
+      - "9222:9222"
     volumes:
       - ./node_server/app.js:/src/app.js
     <<: *net

ibl-frontend/Dockerfile

@@ -1,4 +1,10 @@
 FROM vathes/angulardev:angcli7.1.4-angbuild0.11.4
+# RUN \ 
+#     npm cache clean -f && \
+#     npm install -g n && \
+#     n 12.14.0
+
+# RUN id && npm install -g node@^12.0.0
 
 WORKDIR /app/dist/pipeline-viewer
 

ibl-frontend/dev.dockerfile

@@ -1,5 +1,11 @@
 # don't build
 FROM vathes/angulardev:angcli7.1.4-angbuild0.11.4
+# RUN \ 
+#     npm cache clean -f && \
+#     npm install -g n && \
+#     n 12.14.0
+
+#RUN id && npm install -g node@^12.0.0
 
 HEALTHCHECK       \
     --timeout=3s \ 

ibl-frontend/frontend-content/package.json

@@ -23,44 +23,18 @@
     "@angular/platform-browser": "~7.1.0",
     "@angular/platform-browser-dynamic": "~7.1.0",
     "@angular/router": "~7.1.0",
-    "@types/mathjax": "0.0.35",
     "@wizpanda/super-gif": "0.0.5",
     "angular-plotly.js": "^1.3.2",
-    "body-parser": "^1.18.3",
     "bootstrap": "^4.2.1",
-    "core-js": "^2.5.4",
-    "dotenv": "^8.0.0",
-    "express": "^4.16.4",
-    "jsonwebtoken": "^8.5.1",
-    "mathjax": "^2.7.5",
     "moment": "^2.24.0",
     "plotly.js": "^1.49.0",
-    "plotly.js-dist": "^1.44.4",
-    "request": "^2.88.0",
     "rxjs": "~6.3.3",
     "rxjs-compat": "^6.3.3",
-    "tslib": "^1.9.0",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.11.0",
     "@angular/cli": "~7.1.3",
-    "@angular/compiler-cli": "~7.1.0",
-    "@angular/language-service": "~7.1.0",
-    "@types/node": "~8.9.4",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
-    "jasmine-core": "~2.99.1",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.1.1",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.6"
+    "@angular/compiler-cli": "~7.1.0"
   }
 }

node_server/Dockerfile

@@ -20,6 +20,9 @@ COPY ./ /src/
 # RUN \
 #     mv /src/check-auth.js /src/middleware/
 
-CMD node --max_old_space_size=8192 /src/server.js
+WORKDIR /src
+CMD npm start
+
+# CMD node --max_old_space_size=8192 /src/server.js
 # CMD nodemon /src/server.js
 # CMD tail -f /dev/null

node_server/app.js

@@ -204,8 +204,6 @@ app.post('/sessions', checkAuth, cacheMiddleware(15*60), (req, res) => {
     })
 })
 
-
-
 app.get('/mice', checkAuth, (req, res) => {
     // setup for proxy server
     var options = {

node_server/package.json

@@ -28,5 +28,9 @@
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0"
+  },
+  "scripts": {
+    "start": "node --max_old_space_size=8192 /src/server.js",
+    "test": "node --max_old_space_size=8192 --inspect-brk=0.0.0.0:9222 /src/server.js"
   }
 }