From d673df825c0a6abb3514e86d364787bf87566fb2 Mon Sep 17 00:00:00 2001
From: dharanikesav <dharanikesav@gmail.com>
Date: Tue, 3 Jul 2018 16:04:24 +0200
Subject: [PATCH 1/2] update override capi-port implementation

---
 generate/resources/couchbase-server/scripts/entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generate/resources/couchbase-server/scripts/entrypoint.sh b/generate/resources/couchbase-server/scripts/entrypoint.sh
index cc402bd27..a6afa0ebe 100755
--- a/generate/resources/couchbase-server/scripts/entrypoint.sh
+++ b/generate/resources/couchbase-server/scripts/entrypoint.sh
@@ -28,11 +28,11 @@ function overridePort() {
     fi
 
     if [ "$portNameUpper" == "CAPI_PORT" ]; then
-        if grep -Fq "{${portValue}," ${capiConfigFile}
+        if grep -Fq "port = {${portValue}" ${capiConfigFile}
         then
             echo "Don't override port ${portName} because already available in $staticConfigFile"
         else
-            sed -i -e "s/${capiPortValue}/${portValue}/g" ${capiConfigFile}
+            sed -i -e "s/port = ${capiPortValue}/port = ${portValue}/g" ${capiConfigFile}
         fi
     fi
 }

From 50f3cf50204584c0df83f21e2311a8f8c2075ea4 Mon Sep 17 00:00:00 2001
From: dharanikesav <dharanikesav@gmail.com>
Date: Wed, 18 Jul 2018 07:57:51 +0200
Subject: [PATCH 2/2] Update entrypoint.sh

With earlier approach CAPI PORT was overridden even where port was not specified. Fixed that issue with this commit. Now, CAPI PORT will be overridden only when the value is specified
---
 .../couchbase-server/scripts/entrypoint.sh     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/generate/resources/couchbase-server/scripts/entrypoint.sh b/generate/resources/couchbase-server/scripts/entrypoint.sh
index a6afa0ebe..d0d406f09 100755
--- a/generate/resources/couchbase-server/scripts/entrypoint.sh
+++ b/generate/resources/couchbase-server/scripts/entrypoint.sh
@@ -25,16 +25,16 @@ function overridePort() {
                 restPortValue=${portValue}
             fi
         fi
-    fi
-
-    if [ "$portNameUpper" == "CAPI_PORT" ]; then
-        if grep -Fq "port = {${portValue}" ${capiConfigFile}
-        then
-            echo "Don't override port ${portName} because already available in $staticConfigFile"
-        else
-            sed -i -e "s/port = ${capiPortValue}/port = ${portValue}/g" ${capiConfigFile}
+        
+        if [ "$portNameUpper" == "CAPI_PORT" ]; then
+            if grep -Fq "port = {${portValue}" ${capiConfigFile}
+            then
+                echo "Don't override port ${portName} because already available in $staticConfigFile"
+            else
+                sed -i -e "s/port = ${capiPortValue}/port = ${portValue}/g" ${capiConfigFile}
+            fi   
         fi
-    fi
+    fi    
 }
 
 overridePort "rest_port"