Merge branch 'is713/rename_staging_to_master' into staging

README.md

@@ -53,11 +53,6 @@
   make down
 ```
 
-## Travis / Dockerhub setup
-
-The osparc-simcore repository provides a Travis-CI [recipe](.travis.yml) that fullfills the [Release Workflow].
-To this end Travis must be enabled for the repository and a [Dockerhub](https://hub.docker.com/) account is recommended to push the docker images generated by Travis.
-
 ## Release workflow
 
 ![Git release workflow](docs/img/git-release-workflow.svg)

ops/README.md

@@ -1,3 +1,18 @@
 # osparc-simcore -> ops
 
-Operations / Deployment
+## Travis / Dockerhub setup
+
+The osparc-simcore repository provides a Travis-CI [recipe](.travis.yml) that fullfills the [Release Workflow](docs/img/git-release-workflow.svg).
+
+To this end Travis should be enabled for the repository in each fork and a [Dockerhub](https://hub.docker.com/) account is recommended to push the docker images generated by Travis.
+
+Configuring your travis settings will speed up the travis CI process by making use of Dockerhub (or another docker registry) to move docker images between stages.
+
+### Travis configuration
+
+Define the following secure environment variables in your fork:
+```bash
+DOCKER_REGISTRY # this shall be set to your own dockerhub repository account for example: itisfoundation
+DOCKER_USERNAME # the docker username (!beware this should be a [secure env variable](https://docs.travis-ci.com/user/environment-variables/#defining-encrypted-variables-in-travisyml))
+DOCKER_PASSWORD # the docker password (!beware this should be a [secure env variable](https://docs.travis-ci.com/user/environment-variables/#defining-encrypted-variables-in-travisyml))
+```

packages/simcore-sdk/tests/node_ports/conftest.py

@@ -55,14 +55,14 @@ def here()->Path:
 
 @pytest.fixture("session")
 def image_environ():
-    docker_registry = os.environ.get("DOCKER_REGISTRY")
-    if docker_registry:
-        if not str(docker_registry).endswith("/"):
-            docker_registry = docker_registry + "/"
-            os.environ["DOCKER_REGISTRY"] = docker_registry
-    docker_image_tag = os.environ.get("DOCKER_IMAGE_TAG")
-    if not docker_image_tag:
-        os.environ["DOCKER_IMAGE_TAG"] = "latest"
+    # ensure we have a docker registry
+    docker_registry = os.environ.get("DOCKER_REGISTRY", default="itisfoundation")
+    if not str(docker_registry).endswith("/"):
+        docker_registry = docker_registry + "/"
+    os.environ["DOCKER_REGISTRY"] = docker_registry
+    # ensure we have a docker image tag
+    docker_image_tag = os.environ.get("DOCKER_IMAGE_TAG", default="latest")
+    os.environ["DOCKER_IMAGE_TAG"] = docker_image_tag
 
 @pytest.fixture(scope='session')
 def docker_compose_file(bucket, pytestconfig, here, image_environ): # pylint:disable=unused-argument

services/web/server/tests/integration/fixtures/docker_compose.py

@@ -36,14 +36,14 @@ def tools_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
 
 @pytest.fixture("session")
 def image_environ():
-    docker_registry = os.environ.get("DOCKER_REGISTRY")
-    if docker_registry:
-        if not str(docker_registry).endswith("/"):
-            docker_registry = docker_registry + "/"
-            os.environ["DOCKER_REGISTRY"] = docker_registry
-    docker_image_tag = os.environ.get("DOCKER_IMAGE_TAG")
-    if not docker_image_tag:
-        os.environ["DOCKER_IMAGE_TAG"] = "latest"
+    # ensure we have a docker registry
+    docker_registry = os.environ.get("DOCKER_REGISTRY", default="itisfoundation")
+    if not str(docker_registry).endswith("/"):
+        docker_registry = docker_registry + "/"
+    os.environ["DOCKER_REGISTRY"] = docker_registry
+    # ensure we have a docker image tag
+    docker_image_tag = os.environ.get("DOCKER_IMAGE_TAG", default="latest")
+    os.environ["DOCKER_IMAGE_TAG"] = docker_image_tag
 
 @pytest.fixture("session")
 def devel_environ(env_devel_file, image_environ) -> Dict[str, str]: