removed version

bin/dockerize.sh

@@ -10,21 +10,21 @@ cd provisioner && mvn -Dmaven.test.skip=true dockerfile:build
 [ $status -eq 0 ] && echo "build successful" || exit -1
 cd ../
 echo "----------Building sure_tosca-flask-server Docker--------------"
-cd sure_tosca-flask-server && docker build -t sure-tosca:3.0.0 .
+cd sure_tosca-flask-server && docker build -t sure-tosca .
 [ $status -eq 0 ] && echo "build successful" || exit -1
 echo "----------Building planner Docker--------------"
 cd ../
-cd planner && docker build -t planner:3.0.0 .
+cd planner && docker build -t planner .
 [ $status -eq 0 ] && echo "build successful" || exit -1
 echo "----------Building deployer Docker--------------"
 cd ../
-cd deployer && docker build -t deployer:3.0.0 .
+cd deployer && docker build -t deployer .
 [ $status -eq 0 ] && echo "build successful" || exit -1
 
 
 
-docker tag sure-tosca:3.0.0 qcdis/sure-tosca:3.0.0
-docker tag planner:3.0.0 qcdis/planner:3.0.0
-docker tag deployer:3.0.0 qcdis/deployer:3.0.0
-docker tag manager:3.0.0 qcdis/manager:3.0.0
+docker tag sure-tosca qcdis/sure-tosca
+docker tag planner qcdis/planner
+docker tag deployer qcdis/deployer
+docker tag manager:3.0.0 qcdis/manager
 docker tag provisioner:3.0.0 qcdis/provisioner

docker-compose/docker-compose.yml

@@ -60,7 +60,7 @@ services:
       - rabbit
       - mongo
       - sure-tosca
-    image: manager:3.0.0 
+    image: qcdis/manager 
     environment:
       RABBITMQ_HOST: rabbit
       MONGO_HOST: mongo
@@ -70,7 +70,7 @@ services:
       - "8080:8080"       
             
   sure-tosca:
-    image: sure-tosca:3.0.0
+    image: qcdis/sure-tosca
     ports: 
       - "8081:8081"
     
@@ -78,7 +78,7 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: planner:3.0.0 
+    image: qcdis/planner 
     environment:
       RABBITMQ_HOST: rabbit
     
@@ -86,22 +86,22 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: provisioner:3.0.0 
+    image: qcdis/provisioner 
     environment:
       RABBITMQ_HOST: rabbit      
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
       CLOUD_STORM_SECRET: 456
       CREDENTIAL_SECRET: 123      
     
-  #deployer:
-    #depends_on:
-      #- rabbit
-      #- sure-tosca
-    #image: deployer:3.0.0 
-    #environment:
-      #RABBITMQ_HOST: rabbit           
-      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-      #SEMAPHORE_BASE_PATH: http://semaphore:3000/api
+  deployer:
+    depends_on:
+      - rabbit
+      - sure-tosca
+    image: qcdis/deployer 
+    environment:
+      RABBITMQ_HOST: rabbit           
+      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+      SEMAPHORE_BASE_PATH: http://semaphore:3000/api
       
           
       

k8s/CONF/deployer-deployment.yaml

@@ -35,7 +35,7 @@ spec:
           value: http://sure-tosca:8081/tosca-sure/1.0.0
         - name: SEMAPHORE_BASE_PATH
           value: http://semaphore:3000/api                    
-        image: qcdis/deployer:3.0.0
+        image: qcdis/deployer
         name: deployer
         imagePullPolicy: Always
         resources: {}

k8s/CONF/nginx-service.yaml

@@ -8,10 +8,6 @@ metadata:
 spec:
   type: NodePort  
   ports:
-  - port: 80
-    nodePort: 30000
-    protocol: TCP
-    name: http
   - port: 443
     nodePort: 30001
     protocol: TCP

k8s/CONF/planner-deployment.yaml

@@ -31,7 +31,7 @@ spec:
       - env:
         - name: RABBITMQ_HOST
           value: rabbit
-        image: qcdis/planner:3.0.0
+        image: qcdis/planner
         name: planner
         imagePullPolicy: Always
         resources: {}