Add cdtproxy to docker install

Change-Id: I26a3c5cbb79e9373d7aaf2166802253fb005acd7
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-909

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b82eaaf..15d2f1c 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -52,6 +52,7 @@ services:
     ports:
       - "8282:8181"
       - "1830:1830"
+      - "9090:9191"
     links:
       - db:dbhost
       - db:sdnctldb01

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 3d2689a..48f7aaa 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -46,6 +46,8 @@ limitations under the License.
                     injecting the version.properties variable file during docker build-->
                <appc.docker.staging.version>1.0.0</appc.docker.staging.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+               <!--Determines the version of the cdt-proxy-service to download and install-->
+               <appc.cdt.version>1.3.0-SNAPSHOT</appc.cdt.version>
        </properties>
 
 
@@ -177,6 +179,7 @@ limitations under the License.
                                                        <executable>bash</executable>
                                                        <environmentVariables>
                                                                <APPC_VERSION>${appc.version}</APPC_VERSION>
+                                                               <APPC_CDT_VERSION>${appc.cdt.version}</APPC_CDT_VERSION>
                                                                <APPC_OAM_VERSION>${project.version}</APPC_OAM_VERSION>
                                                                <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
                                                        </environmentVariables>

diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index 9296c3b..01045d4 100644 (file)
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -77,6 +77,7 @@ APPC_FEATURES=" \
 FEATURES_PER_DIRECTORY=$(($(echo $APPC_FEATURES|wc -w)/$FEATURE_DIRECTORY_COUNT))
 
 APPC_VERSION=${APPC_VERSION:-0.0.1}
+APPC_CDT_VERSION=${APPC_CDT_VERSION:-0.0.1}
 APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1}
 AAF_SHIRO_VERSION=${AAF_SHIRO_VERSION:-2.1.0-SNAPSHOT}
 
@@ -130,6 +131,10 @@ echo "Downloading aaf-cadi-shiro from nexus"
 mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.authz:aaf-shiro-aafrealm-osgi-bundle:${AAF_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data
 mv ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle-*.jar ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle.jar
 
+echo "Downloading CDT Proxy Jar from nexus"
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.cdt:cdt-proxy-service:${APPC_CDT_VERSION} -DoutputDirectory=${targetDir}/cdt-proxy-service
+mv ${targetDir}/cdt-proxy-service/cdt-proxy-service-*.jar ${targetDir}/cdt-proxy-service/cdt-proxy-service.jar
+
 find ${targetDir} -name '*.sh' -exec chmod +x '{}' \;
 
 cd $cwd

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index f58db40..99def7f 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -133,4 +133,7 @@ fi
        appcInstallEndTime=$(date +%s)
        echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
 
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
 exec ${ODL_HOME}/bin/karaf