removed duplicate properties file

commons/src/main/resources/application.properties

-message.broker.host=127.0.0.1
-message.broker.username=guest
-message.broker.password=guest
-message.broker.queue.provisioner=provisioner
-message.broker.queue.planner=planner
-message.broker.queue.deployer=deployer
-
-sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0

docker-compose/docker-compose.yml

@@ -60,16 +60,17 @@ services:
       - rabbit
       - mongo
       - sure-tosca
-    image: qcdis/manager:3.0.0 
+    image: manager:3.0.0 
     environment:
       RABBITMQ_HOST: rabbit
       MONGO_HOST: mongo
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+      CREDENTIAL_SECRET: 123
     ports:
       - "8080:8080"       
             
   sure-tosca:
-    image: qcdis/sure-tosca:3.0.0
+    image: sure-tosca:3.0.0
     ports: 
       - "8081:8081"
     
@@ -77,7 +78,7 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: qcdis/planner:3.0.0 
+    image: planner:3.0.0 
     environment:
       RABBITMQ_HOST: rabbit
     
@@ -85,7 +86,7 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: qcdis/provisioner:3.0.0 
+    image: provisioner:3.0.0 
     environment:
       RABBITMQ_HOST: rabbit      
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
@@ -94,11 +95,13 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: qcdis/deployer:3.0.0 
+    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   
+      CREDENTIAL_SECRET: 123
+      ENCRYPTION_PASSWORD: 456
           
       
 

k8s/CONF/deployer-deployment.yaml.template

@@ -37,6 +37,8 @@ spec:
           value: http://semaphore:3000/api     
         - name: CREDENTIAL_SECRET
           value: top_secret          
+        - name: ENCRYPTION_PASSWORD
+          value: top_secret             
         image: qcdis/deployer:3.0.0
         name: deployer
         imagePullPolicy: Always

manager/Dockerfile

@@ -5,7 +5,7 @@ CMD jar -xf manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     sed -ie "s#^message.broker.host=.*#message.broker.host=$RABBITMQ_HOST#" BOOT-INF/classes/application.properties && \ 
     sed -ie "s#^db.host=.*#db.host=$MONGO_HOST#" BOOT-INF/classes/application.properties && \ 
     sed -ie "s#^sure-tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" BOOT-INF/classes/application.properties && \
-    echo "credential.secret=$CREDENTIAL_SECRET" >> application.properties && \
+    sed -ie "s#^credential.secret=.*#credential.secret=$CREDENTIAL_SECRET#" BOOT-INF/classes/application.properties && \
     cat BOOT-INF/classes/application.properties && \
     jar -uf manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     java -jar manager-3.0.0.jar

provisioner/Dockerfile

@@ -6,9 +6,9 @@ CMD jar -xf provisioner-3.0.0-jar-with-dependencies.jar application.properties &
     cat application.properties && \
     sed -ie "s#^message.broker.host=.*#message.broker.host=$RABBITMQ_HOST#" application.properties && \ 
     sed -ie "s#^sure-tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" application.properties && \
-    echo "cloud.storm.secret=$ENCRYPTION_PASSWORD" >> application.properties && \
-    echo "cloud.storm.db.path=/etc/UD" >> application.properties && \
-    echo "credential.secret=$CREDENTIAL_SECRET" >> application.properties && \
+    sed -ie "s#^cloud.storm.secret=.*#cloud.storm.secret=$ENCRYPTION_PASSWORD#" application.properties && \
+    sed -ie "s#^cloud.storm.db.path=.*#cloud.storm.db.path=/etc/UD#" application.properties && \
+    sed -ie "s#^credential.secret=.*#credential.secret=$CREDENTIAL_SECRET#" application.properties && \
     cat application.properties && \
     jar -uf provisioner-3.0.0-jar-with-dependencies.jar application.properties && \
     sleep 5 && \

provisioner/src/test/resources/application.properies

-message.broker.host=127.0.0.1
-message.broker.username=guest
-message.broker.password=guest
-message.broker.queue.provisioner=provisioner
-message.broker.queue.planner=planner
-message.broker.queue.deployer=deployer
-sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0