Merge branch 'master' into is309/webserver-uses-apihub

Author: Pedro Crespo

.env-devel

@@ -14,6 +14,7 @@ RABBITMQ_USER=simcore
 RABBITMQ_PASSWORD=simcore
 RABBITMQ_PROGRESS_CHANNEL=comp.backend.channels.progress
 RABBITMQ_LOG_CHANNEL=comp.backend.channels.log
+REGISTRY_URL=masu.speag.com
 S3_ENDPOINT=minio:9000
 S3_ACCESS_KEY=12345678
 S3_SECRET_KEY=12345678

.pyup.yml

@@ -0,0 +1,4 @@
+# autogenerated pyup.io config file 
+# see https://pyup.io/docs/configuration/ for all available options
+
+schedule: every month

.travis.yml

@@ -3,6 +3,11 @@ matrix:
     - language: node_js
       node_js:
         - "8"
+
+      cache:
+        directories:
+          - .npm
+
       install:
         - npm install -g npm@latest
         - npm install --save-dev eslint

Makefile

@@ -3,6 +3,7 @@
 # TODO: add flavours by combinging docker-compose files. Namely development, test and production.
 VERSION := $(shell uname -a)
 # SAN this is a hack so that docker-compose works in the linux virtual environment under Windows
+WINDOWS_MODE=OFF
 ifneq (,$(findstring Microsoft,$(VERSION)))
 $(info    detected WSL)
 export DOCKER_COMPOSE=docker-compose
@@ -11,13 +12,22 @@ export RUN_DOCKER_ENGINE_ROOT=1
 # Windows does not have these things defined... but they are needed to execute a local swarm
 export DOCKER_GID=1042
 export HOST_GID=1000
+WINDOWS_MODE=ON
 else ifeq ($(OS), Windows_NT)
 $(info    detected Powershell/CMD)
 export DOCKER_COMPOSE=docker-compose.exe
 export DOCKER=docker.exe
 export RUN_DOCKER_ENGINE_ROOT=1
 export DOCKER_GID=1042
 export HOST_GID=1000
+WINDOWS_MODE=ON
+else ifneq (,$(findstring Darwin,$(VERSION)))
+$(info    detected OSX)
+export DOCKER_COMPOSE=docker-compose
+export DOCKER=docker
+export RUN_DOCKER_ENGINE_ROOT=1
+export DOCKER_GID=1042
+export HOST_GID=1000
 else
 $(info    detected native linux)
 export DOCKER_COMPOSE=docker-compose
@@ -30,6 +40,8 @@ endif
 
 PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg*" -not -path "*contrib*" -not -path "*-sdk/python*" -not -path "*generated_code*" -not -path "*datcore.py" -not -path "*web/server*"))
 
+TEMPCOMPOSE := $(shell mktemp)
+
 export PYTHONPATH=${CURDIR}/packages/s3wrapper/src:${CURDIR}/packages/simcore-sdk/src
 
 all:
@@ -49,6 +61,10 @@ rebuild-devel:
 up-devel:
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.tools.yml up
 
+up-webclient-devel: up-swarm-devel remove-intermediate-file file-watcher
+	${DOCKER} service rm services_webclient
+	${DOCKER_COMPOSE} -f services/web/client/docker-compose.yml up qx
+
 build:
 	${DOCKER_COMPOSE} -f services/docker-compose.yml build
 
@@ -60,14 +76,36 @@ up:
 
 up-swarm:
 	${DOCKER} swarm init
-	${DOCKER} stack deploy -c services/docker-compose.yml -c services/docker-compose.deploy.yml  -c services/docker-compose.tools.yml services
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.deploy.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
+	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml services
 
 up-swarm-devel:
 	${DOCKER} swarm init
-	${DOCKER} stack deploy -c services/docker-compose.yml -c services/docker-compose.devel.yml -c services/docker-compose.deploy.devel.yml  -c services/docker-compose.tools.yml services
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.deploy.devel.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
+	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml services
+
+ifeq ($(WINDOWS_MODE),ON)
+remove-intermediate-file:
+	$(info    .tmp-compose.yml not removed)
+else
+remove-intermediate-file:
+	rm $(TEMPCOMPOSE).tmp-compose.yml
+endif
+
+ifeq ($(WINDOWS_MODE),ON)
+file-watcher:
+	pip install docker-windows-volume-watcher
+	# unfortunately this is not working properly at the moment
+	# docker-windows-volume-watcher python package will be installed but not executed
+	# you will have to run 'docker-volume-watcher *qx*' in a different process in ./services/web/client/source
+	# docker-volume-watcher &
+else
+file-watcher:
+	true
+endif
 
 down:
-	${DOCKER_COMPOSE} -f services/docker-compose.yml  -f services/docker-compose.tools.yml down
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.tools.yml down
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml down
 
 down-swarm:
@@ -155,4 +193,4 @@ push_platform_images:
 
 
 
-.PHONY: all clean build-devel rebuild-devel up-devel build up down test after_test push_platform_images
+.PHONY: all clean build-devel rebuild-devel up-devel build up down test after_test push_platform_images file-watcher up-webclient-devel

services/director/requirements/base.txt

@@ -1,6 +1,5 @@
 # Common third party packages
-# Please keep alphabetical order
 aiohttp==3.3.2
 docker==3.5.0
 requests==2.20.1
-tenacity==4.12.0
+tenacity==4.12.0

services/docker-compose.deploy.devel.yml

@@ -12,8 +12,8 @@ services:
   director:
     #image: masu.speag.com/simcore/workbench/director:2.3
     image: services_director:dev
-    dns:
-      - 172.16.8.15
+    #dns:
+    #  - 172.16.8.15
     deploy:
       placement:
        constraints:
@@ -44,8 +44,8 @@ services:
   webserver:
     #image: masu.speag.com/simcore/workbench/webserver:2.3
     image: services_webserver:dev
-    dns:
-      - 172.16.8.15
+    #dns:
+    #  - 172.16.8.15
     deploy:
       placement:
         constraints:
@@ -75,12 +75,12 @@ services:
       - RABBITMQ_DEFAULT_PASS=simcore
   postgres:
     image: postgres:10
-    environment:      
+    environment:
       - POSTGRES_USER=simcore
       - POSTGRES_PASSWORD=simcore
       - POSTGRES_DB=simcoredb
   adminer:
-    image: adminer    
+    image: adminer
     depends_on:
       - postgres
   sidecar:

services/docker-compose.deploy.yml

@@ -12,8 +12,8 @@ services:
   director:
     #image: masu.speag.com/simcore/workbench/director:2.3
     image: services_director:latest
-    dns:
-      - 172.16.8.15
+    #dns:
+    #  - 172.16.8.15
     deploy:
       placement:
        constraints:
@@ -38,8 +38,8 @@ services:
   webserver:
     #image: masu.speag.com/simcore/workbench/webserver:2.3
     image: services_webserver:latest
-    dns:
-      - 172.16.8.15
+    #dns:
+    #  - 172.16.8.15
     deploy:
       placement:
         constraints:
@@ -70,12 +70,12 @@ services:
       - RABBITMQ_DEFAULT_PASS=simcore
   postgres:
     image: postgres:10
-    environment:      
+    environment:
       - POSTGRES_USER=simcore
       - POSTGRES_PASSWORD=simcore
       - POSTGRES_DB=simcoredb
   adminer:
-    image: adminer    
+    image: adminer
     depends_on:
       - postgres
   sidecar:

services/docker-compose.swarm.yml.template

@@ -11,12 +11,12 @@ services:
           - node.platform.os == linux
     ports:
       - '8043:8043'
-      
+
   director:
     image: masu.speag.com/simcore/workbench/director:3.9
     #image: services_director:latest
-    dns:
-      - 172.16.8.15
+    #dns:
+    #  - 172.16.8.15
     deploy:
       placement:
        constraints:
@@ -49,8 +49,8 @@ services:
   webserver:
     image: masu.speag.com/simcore/workbench/webserver:3.9
     #image: services_webserver:latest
-    dns:
-      - 172.16.8.15
+    #dns:
+    # - 172.16.8.15
     deploy:
       placement:
         constraints:

services/docker-compose.yml

@@ -21,7 +21,7 @@ services:
     # on Windows follow http://www.computerperformance.co.uk/powershell/powershell_profile_ps1.htm
     # currently needs to set $Env:COMPOSE_CONVERT_WINDOWS_PATHS=1 in powershell to make this works
     # on a windows machine
-      - REGISTRY_URL=masu.speag.com
+      - REGISTRY_URL=${REGISTRY_URL}
       - REGISTRY_AUTH=True
       - REGISTRY_USER=z43
       - REGISTRY_PW=z43

services/sidecar/Dockerfile

@@ -69,7 +69,7 @@ ENV DEBUG 1
 ENV RUN_DOCKER_ENGINE_ROOT=0
 USER root
 ENTRYPOINT [ "/bin/sh", "docker/entrypoint.sh" ]
-CMD ./boot.sh
+CMD ["/bin/sh", "boot.sh"]
 
 
 # --------------------------Production multi-stage -------------------
@@ -102,4 +102,4 @@ ENV DEBUG 0
 ENV RUN_DOCKER_ENGINE_ROOT=0
 USER root
 ENTRYPOINT [ "/bin/sh", "docker/entrypoint.sh" ]
-CMD ["/bin/sh", "./boot.sh"]
+CMD ["/bin/sh", "boot.sh"]

services/web/client/source/class/qxapp/auth/core/BaseAuthPage.js

@@ -27,7 +27,7 @@ qx.Class.define("qxapp.auth.core.BaseAuthPage", {
     // outside a form, so lets accomodate him
     this.addListenerOnce("appear", e => {
       let el = this.getContentElement();
-      let form = this._form = new qx.html.Element("form", null, {
+      let form = this._formElement = new qx.html.Element("form", null, {
         name: "fakeLoginform",
         autocomplete: "on"
       });
@@ -58,7 +58,7 @@ qx.Class.define("qxapp.auth.core.BaseAuthPage", {
      * when all is said and done we should remove the form so that the password manager
      * knows to save the content of the form. so we save it here.
      */
-    _form: null,
+    _formElement: null,
     /**
      * This method gets called upon construction and
      * must be overriden in a subclass

services/web/client/source/class/qxapp/auth/ui/LoginPage.js

@@ -31,9 +31,8 @@ qx.Class.define("qxapp.auth.ui.LoginPage", {
   */
 
   members: {
-    __form: null,
-
     // overrides base
+    __form: null,
     _buildPage: function() {
       this.__form = new qx.ui.form.Form();
 
@@ -137,9 +136,10 @@ qx.Class.define("qxapp.auth.ui.LoginPage", {
 
       let successFun = function(log) {
         this.fireDataEvent("done", log.message);
-        // we don't need the form any more, so remove it
+        // we don't need the form any more, so remove it and mock-navigate-away
         // and thus tell the password manager to save the content
-        this._form.dispose();
+        this._formElement.dispose();
+        window.history.replaceState(null, window.document.title, window.location.pathname);
       };
 
       let failFun = function(msg) {