diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae27e65076b969a93fba02e43b411f5b818dc27a..352b6bfc3baacdbd3357cf349feeb30a87f25eea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,7 +205,7 @@ Scan Docker Image: # Deploy Stage ## -------------------------------------------------- -Deploy Mage01 Library: +Mage01 Library: extends: - .deploy-library - .staging @@ -216,7 +216,7 @@ Deploy Mage01 Library: variables: APP_NAME: geomag-algorithms -Deploy Mage01 Web Service: +Mage01 Web Service: extends: - .deploy - .staging @@ -227,7 +227,18 @@ Deploy Mage01 Web Service: variables: APP_NAME: geomag-algorithms -Deploy Mage02 Web Service: +Mage02 Library: + extends: + - .deploy-library + - .production + tags: + - deploy + - swarm + - mage02 + variables: + APP_NAME: geomag-algorithms + +Mage02 Web Service: extends: - .deploy - .production @@ -238,7 +249,7 @@ Deploy Mage02 Web Service: variables: APP_NAME: geomag-algorithms -Deploy Production01 Web Service: +Production01 Web Service: extends: - .deploy - .production @@ -249,7 +260,7 @@ Deploy Production01 Web Service: variables: APP_NAME: geomag-algorithms -Deploy Production02 Web Service: +Production02 Web Service: extends: - .deploy - .production @@ -260,7 +271,7 @@ Deploy Production02 Web Service: variables: APP_NAME: geomag-algorithms -Deploy Staging01 Web Service: +Staging01 Web Service: extends: - .deploy - .staging @@ -271,7 +282,7 @@ Deploy Staging01 Web Service: variables: APP_NAME: geomag-algorithms -Deploy Staging02 Web Service: +Staging02 Web Service: extends: - .deploy - .staging diff --git a/Pipfile b/Pipfile index 0fe36b7372e7751b47a890c4f3f186d06c68deba..074a95e9ef5e8815e9c6b68ea9ca1a5c68ff96f2 100644 --- a/Pipfile +++ b/Pipfile @@ -16,7 +16,7 @@ webtest = "*" numpy = "*" scipy = "*" obspy = "*" -pycurl = "==7.43.0.5" +pycurl = "*" # web service dependencies authlib = "*"