Merge branch 'is713/rename_staging_to_master' into staging

README.md

@@ -1,5 +1,7 @@
 # osparc-simcore platform
 
+**WARNING** This application is **still under development**.
+
 <!-- NOTE: when branched replace `master` in urls -->
 [`master`](https://github.com/itisfoundation/osparc-simcore/tree/master)
 [![Requires.io]](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master "State of third party python dependencies")
@@ -51,9 +53,6 @@
   make down
 ```
 
-**WARNING** This application is **still under development** and still not suitable for Staging purposes.
-
-
 ## Release workflow
 
 ![Git release workflow](docs/img/git-release-workflow.svg)

docs/img/git-release-workflow.md

@@ -8,48 +8,58 @@ participant Staging
 Master->>Feature: create feature1 branch
 Note over Feature: develop feature1...
 Feature-->>Master: Pull Request feature1
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master->>Feature: create feature2 branch
 Note over Feature: develop feature2...
 Feature-->>Master: Pull Request feature2
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master-->>Staging: Pull Request staging1
-Staging->Staging: autodeploys to staging.io
-Note over Staging: ready for realease?
+Staging->Staging: CI: build docker images - tests -> Dockerhub
+Staging->Staging: CD -> staging.io
+Note over Staging: ready for release?
 
 Master->>Feature: create feature3 branch
 Note over Feature: develop feature3...
 Feature-->>Master: Pull Request feature3
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master->>Feature: create feature4 branch
 Note over Feature: develop feature4...
 Feature-->>Master: Pull Request feature4
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master-->>Staging: Pull Request staging2
-Staging->Staging: autodeploys to staging.io
+Staging->Staging: CI: build docker images - tests -> Dockerhub
+Staging->Staging: CD -> staging.io
 Note over Staging: ready for release?
-Staging->Staging: RELEASE: Tag v1.0.0 - autodeploys to osparc.io
+Staging->Staging: RELEASE: Tag v1.0.0 - CD -> osparc.io
 
 Staging->>Hotfix: create hotfix1 branch
 Note over Hotfix: fix issue...
 Hotfix-->>Staging: Pull request hotfix1
-Staging->Staging: autodeploys to staging.io
+Staging->Staging: CI: build docker images - tests -> Dockerhub
+Staging->Staging: CD -> staging.io
 Note over Staging: ready for release?
-Staging->Staging: RELEASE: Tag v1.0.1 - autodeploys to osparc.io
+Staging->Staging: RELEASE: Tag v1.0.1 - CD -> osparc.io
 Hotfix-->>Master: Pull request hotfix1
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master->>Feature: create feature10 branch
 Note over Feature: develop feature10...
 Feature-->>Master: Pull Request feature10
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 
 Master->>Feature: create featureN branch
 Note over Feature: develop featureN...
 Feature-->>Master: Pull Request featureN
-Master->Master: autodeploys to master.dev
+Master->Master: CI: build docker images - tests -> Dockerhub
+Master->Master: CD -> master.dev
 ```