change docker repo , update build docker_push and dockerize

.travis.yml

@@ -12,7 +12,7 @@ matrix:
     - pip install -r test-requirements.txt
     script:
     - python -m unittest discover
-    - docker build -t qcdia/sure-tosca:3.0.0 .
+    - docker build -t qcdis/sure-tosca:3.0.0 .
     
 #------------sure_tosca-client-----------------    
   - language: python
@@ -54,7 +54,7 @@ matrix:
     fi; done    
     script:
     - python -m unittest discover
-    - docker build -t qcdia/planner:3.0.0 .
+    - docker build -t qcdis/planner:3.0.0 .
     
 #------------deployer------------------  
   - language: python
@@ -73,7 +73,7 @@ matrix:
     fi; done   
     script:
     - python -m unittest discover
-    - docker build -t qcdia/deployer:3.0.0 .
+    - docker build -t qcdis/deployer:3.0.0 .
 
 #------------manager and provisioner------------------      
   - language: java
@@ -95,16 +95,16 @@ matrix:
     
 after_success:
 - docker login -u $DOCKER_USER -p $DOCKER_PASS
-- docker tag manager:3.0.0 qcdia/manager:3.0.0
-- docker push qcdia/manager:3.0.0
-- docker tag sure-tosca:3.0.0 qcdia/sure-tosca:3.0.0
-- docker push qcdia/sure-tosca:3.0.0
-- docker tag planner:3.0.0 qcdia/planner:3.0.0
-- docker push qcdia/planner:3.0.0
-- docker tag provisioner:3.0.0 qcdia/provisioner:3.0.0
-- docker push qcdia/provisioner:3.0.0
-- docker tag deployer:3.0.0 qcdia/deployer:3.0.0
-- docker push qcdia/deployer:3.0.0
+- docker tag manager:3.0.0 qcdis/manager:3.0.0
+- docker push qcdis/manager:3.0.0
+- docker tag sure-tosca:3.0.0 qcdis/sure-tosca:3.0.0
+- docker push qcdis/sure-tosca:3.0.0
+- docker tag planner:3.0.0 qcdis/planner:3.0.0
+- docker push qcdis/planner:3.0.0
+- docker tag provisioner:3.0.0 qcdis/provisioner:3.0.0
+- docker push qcdis/provisioner:3.0.0
+- docker tag deployer:3.0.0 qcdis/deployer:3.0.0
+- docker push qcdis/deployer:3.0.0
 env:
   global:
   - secure: ymUnVWoFsn6dGShBx+mJvOOtkdTdtkXuKDWUxDitn+M5SVYdFUGN+UbvrMp8hKQfC8ZQT+/sOGIvdWWE2ruQEeAx9cBSQ4+4x7eup7kORNxzAH2OplWZwoYh+TAl3zx/kHiVh5k6+GnoRWPS3fDvlb/AALdUCsUtz3JzUpYLeAWPfs7czc8frc3gBvnBwORC4iomSrAw+/cmjPhcysyq7zMCnpiriC/APstbotzAuOzDyeOds8pZqUuUri8XKlzlMQtIqVX851S/P/dwf5XcOTX1RUFhRCcYosmkbfR98nabYekhbSyW/ONMQdGMsdurDLJ4obxbD4c/zijvZfUTWMWZnDIlmR1dTy9at8lNJ7OPQw7zHDkj1T4YuofrBZ+LNlDYz7Ad2U6Uo3vD8bTcgaBk9I/0/inJ4JjE6hAxCl9V19revyy+/89ogA7v30cTXW48tJ8JziZqmyXUYR4eLZGyTlR3Ee79Bsu3vsTqX06/8IWFbc1XfIg6ZrwsP1EfCTRDiK4nqAGInhiLo1x9y3kdZkI3X0m90Jr88T8VpUIp1Dvp7OScpEXnE/J1Lgo3e082l1k4ehXTb6ocwKrA3gSlKFV6vJCIhxmU9nUO67axzBz6Sz4gaY//+jhoDL59UOsUQ/dJATVmawkQJIVH1EcU42SD64bAGvjS1mSFEek=

bin/docker_push.sh

 #!/bin/bash
 
-docker push qcdia/manager:3.0.0
-docker push qcdia/provisioner:3.0.0
-docker push qcdia/sure-tosca:3.0.0
-docker push qcdia/planner:3.0.0
-docker push qcdia/deployer:3.0.0
+docker push qcdis/manager:3.0.0
+docker push qcdis/provisioner:3.0.0
+docker push qcdis/sure-tosca:3.0.0
+docker push qcdis/planner:3.0.0
+docker push qcdis/deployer:3.0.0

docker-compose-test.yml

@@ -31,6 +31,6 @@ services:
       - mysql
             
   sure-tosca:
-    image: qcdia/sure-tosca:3.0.0
+    image: qcdis/sure-tosca:3.0.0
     ports: 
       - "8081:8081"   

docker-compose.yml

@@ -91,14 +91,14 @@ services:
       RABBITMQ_HOST: rabbit      
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
     
-  #deployer:
-    #depends_on:
-      #- rabbit
-      #- sure-tosca
-    #image: deployer:3.0.0 #deployer:3.0.0
-    #environment:
-      #RABBITMQ_HOST: rabbit           
-      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+  deployer:
+    depends_on:
+      - rabbit
+      - sure-tosca
+    image: deployer:3.0.0 #deployer:3.0.0
+    environment:
+      RABBITMQ_HOST: rabbit           
+      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
 
       
 #volumes:

manager/pom.xml

@@ -10,7 +10,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <springfox-version>2.9.2</springfox-version>
-        <docker.image.prefix>qcdia</docker.image.prefix>
+        <docker.image.prefix>qcdis</docker.image.prefix>
     </properties>
     <parent>
         <groupId>nl.uva.sne.drip</groupId>

provisioner/pom.xml

@@ -15,7 +15,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <docker.image.prefix>qcdia</docker.image.prefix>
+        <docker.image.prefix>qcdis</docker.image.prefix>
     </properties>
     
     

sure_tosca-flask-server/requirements.txt

@@ -5,5 +5,5 @@ python-dateutil==2.8.1
 typing==3.7.4.1
 swagger-ui-bundle==0.0.6
 tinydb==3.15.2
-tosca-parser ==1.7.0
+tosca-parser==1.7.0
 flask-restx==0.1.1
\ No newline at end of file