change distribution target for assemblies

Dockerfile

@@ -14,6 +14,7 @@ WORKDIR /opt/engine
 
 # this is a specific yang.db assembly used for knowledge based ontology - a general purpose RDF schema
 COPY distrib/knowledge-knowledge /opt/engine
+COPY distrib/knowledge-fuse-source.zip /opt/engine
 
 RUN chmod 755 /opt/engine/start-fuse-service.sh
 # clean

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   fuse:
-    image: yangdb/yang.db:Sep-2019-RC2
+    image: yangdb/yang.db:latest
     ports:
       - 8888:8888
     environment:

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-assembly/assembly/fuse.test.service.engine3.knowledge.xml

@@ -36,10 +36,6 @@
             <outputDirectory>./</outputDirectory>
             <destName>readme.txt</destName>
         </file>
-        <file>
-            <source>${project.basedir}/resources/scripts/standard/start-fuse-service.bat</source>
-            <outputDirectory>./</outputDirectory>
-        </file>
         <file>
             <source>${project.basedir}/resources/scripts/standard/start-fuse-service.sh</source>
             <outputDirectory>./</outputDirectory>

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-assembly/resources/scripts/standard/start-fuse-service.sh

@@ -7,19 +7,25 @@ activeProfile=activeProfile
 logbackConfigurationFilename=config/logback.xml
 heapSize=1g
 
+elasticsearchEmbedded="${ELASTICSEARCH_EMBEDDED:-true}"
 elasticsearchHosts="${ELASTICSEARCH_HOST:-localhost}"
 elasticsearchClusterName="${ELASTICSEARCH_CLUSTER_NAME}"
+elasticsearchTcpPort="${ELASTICSEARCH_TCP_PORT:-9300}"
 
 argName=
 for var in "$@"
 do
     if [ "${argName}" = "" ]; then
         if [ "${var}" = "--heapSize" ]; then
             argName=heapSize
+        elif [ "${var}" = "--elasticsearch.embedded" ]; then
+            argName=elasticsearchEmbedded
         elif [ "${var}" = "--elasticsearch.hosts" ]; then
             argName=elasticsearchHosts
         elif [ "${var}" = "--elasticsearch.cluster_name" ]; then
             argName=elasticsearchClusterName
+        elif [ "${var}" = "--elasticsearch.port" ]; then
+            argName=elasticsearchTcpPort
         elif [ "${var}" = "--config" ]; then
             argName=configFile
         elif [ "${var}" = "--logConfig" ]; then
@@ -46,6 +52,10 @@ if [ "${jmxEnabled}" != "" ]; then
     systemProperties="${systemProperties} -Dcom.sun.management.jmxremote.ssl=false"
 fi
 
+if [ "${elasticsearchEmbedded}" != "" ]; then
+	systemProperties="${systemProperties} -Delasticsearch.embedded=${elasticsearchEmbedded}"
+	echo ElasticSearch embedded param: -Delasticsearch.embedded=${elasticsearchEmbedded}
+fi
 if [ "${elasticsearchHosts}" != "" ]; then
 	systemProperties="${systemProperties} -Delasticsearch.hosts=${elasticsearchHosts}"
 	echo ElasticSearch hosts param: -Delasticsearch.hosts=${elasticsearchHosts}
@@ -56,6 +66,11 @@ if [ "${elasticsearchClusterName}" != "" ]; then
 	echo ElasticSearch cluster param: -Delasticsearch.cluster_name=${elasticsearchClusterName}
 fi
 
+if [ "${elasticsearchTcpPort}" != "" ]; then
+	systemProperties="${systemProperties} -Delasticsearch.port=${elasticsearchTcpPort}"
+	echo ElasticSearch TCP port param:  -Delasticsearch.port=${elasticsearchTcpPort}
+fi
+
 #jolokia = -javaagent:lib/jolokia-jvm-1.6.2-agent.jar=port=8088,host=localhost
 
 echo java -Xmx${heapSize} -Xms${heapSize} ${systemProperties} ${debugParams} -cp ${classPath} ${mainClass} ${configFile} ${activeProfile} ${logbackConfigurationFilename}