Introduce a container name

Author: Stephane Mery

odm-deployer/README.md

@@ -4,18 +4,22 @@ XOM and Ruleapps to the RES from dedicated Smart Contracts involved on specific
 
 # setting up the deployer 
 
-- Launch a terminal window and go the odm-deployer project directory
-- enter: 'docker-compose up -d' to build the image and start the service
+- Launch a terminal window and go the `odm-deployer` project directory
+- enter: `docker-compose up -d` to build the image and start the service
 
 # stopping the deployer
 
-You need to stop the deployer using 'docker-compose down' from the odm-deployer project directory. 
-If you change the code of the service, you need to remove the existing images by invoking the 
-following Docker command:
-docker rmi smartcontract/odm-deployer:1.0.0
+You need to stop the deployer using `docker-compose down` from the `odm-deployer` project directory. 
+
+If you change the code of the service, you need to remove the existing images so that a new one can be created with the new code. 
+You can remove the image by invoking the following Docker command:
+`docker rmi smartcontract/odm-deployer:1.0.0`
 
 To create a Docker image from the dockerfile in this directory use the following docker command:
-docker build -t smartcontract/odm-deployer .
+`docker-compose build`
+
+Note that `docker-compose up` will build the images if it does not exist yet.
+
 
 
 

odm-deployer/docker-compose.yml

@@ -1,6 +1,7 @@
 version: '2'
 services:
   odm-deployer:
+    container_name: odm-deployer
     image: smartcontract/odm-deployer:1.0.0
     build: 
       context: ./

odm-deployer/server.js

@@ -61,7 +61,8 @@ app.post('/deploy', function (req, res) {
     header['Content-Length'] = buf.length;
 
     var options = {
-      host: 'odmruntime_odm-runtime_1',
+      // host: 'odmruntime_odm-runtime_1',
+      host: 'odm-runtime',
       port: '9060',
       path: '/res/api/v1/ruleapps?merging=REPLACE_MERGING_POLICY',
       method: 'POST',
@@ -149,7 +150,8 @@ var updateArchiveXom = function(ruleappName, rulesetName, ruleappVersion, rulese
     header['Content-Length'] = body.length;
 
     var options = {
-      host: 'odmruntime_odm-runtime_1',
+      //host: 'odmruntime_odm-runtime_1',
+      host: 'odm-runtime',
       port: '9060',
       path: '/res/api/v1/ruleapps/' + ruleappName + '/' + ruleappVersion + '/' + rulesetName + '/' + rulesetVersion + '/properties/ruleset.managedxom.uris',
       method: 'POST',
@@ -220,7 +222,8 @@ app.post('/deployXom', function (req, res) {
     header['Content-Length'] = buf.length;
 
     var options = {
-      host: 'odmruntime_odm-runtime_1',
+      // host: 'odmruntime_odm-runtime_1',
+      host: 'odm-runtime',
       port: '9060',
       path: '/res/api/v1/xoms/' + xomName,
       method: 'POST',
@@ -312,7 +315,8 @@ var updateLibrary = function(uri, libraryName, libraryVersion)
     header['Content-Length'] = body.length;
 
     var options = {
-      host: 'odmruntime_odm-runtime_1',
+      // host: 'odmruntime_odm-runtime_1',
+      host: 'odm-runtime',
       port: '9060',
       path: '/res/api/v1/libraries/' + libraryName + '/' + libraryVersion,
       method: 'PUT',

odm-runtime/docker-compose.yml

@@ -4,6 +4,7 @@ services:
   # ODMVERSION : The Operational Decision Management version
   # ODMDOCKERDIR : The Directory where this 
   odm-runtime:
+    container_name: odm-runtime
     image: smartcontract/odm-runtime:8.9.0
     build: 
       context: ./

vehicle-lifecycle/lib/vda.js

@@ -87,7 +87,8 @@ function privateVehicleTransfer(privateVehicleTransfer) {
         // should be assigned to the Vehicle.suspiciousMessage field
         // The Decision Service receives all the data about the current transaction: buyer, seller and the vehicle
 
-        var url = 'http://odmruntime_odm-runtime_1:9060/DecisionService/rest/' + rulesetPath;
+        // var url = 'http://odmruntime_odm-runtime_1:9060/DecisionService/rest/' + rulesetPath;
+        var url = 'http://odm-runtime:9060/DecisionService/rest/' + rulesetPath;
 
         var dsCallObject = factory.newResource(NS_DECISION, 'IsSuspiciousTransferDecisionService', "isSuspiciousTransfer");
         dsCallObject.transaction = privateVehicleTransfer;