aboutsummaryrefslogtreecommitdiffstats
path: root/cdt
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-05-29 14:08:46 -0700
committerPatrick Brady <pb071s@att.com>2018-05-30 15:47:18 +0000
commit27525d8cce704f03b28eb8833ac1533126ece7da (patch)
tree6323215e700499f85dabdfbb0ff2fac15ed2c56b /cdt
parent381bae7d21fd176d8eb0fd52046fb3bfecc4f837 (diff)
Allow cdt port to be set
Allow the cdt port to be set by the CDT_PORT variable. Defaults to the default oom port. Change-Id: Ib916b0ab2d9267aa01c31372a57738a8c2d6bae6 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-924
Diffstat (limited to 'cdt')
-rw-r--r--cdt/pom.xml27
-rw-r--r--cdt/src/main/docker/Dockerfile2
-rw-r--r--cdt/src/main/scripts/installZips.sh1
-rw-r--r--cdt/src/main/scripts/startCdt.sh27
4 files changed, 52 insertions, 5 deletions
diff --git a/cdt/pom.xml b/cdt/pom.xml
index 8683470..bbe44f1 100644
--- a/cdt/pom.xml
+++ b/cdt/pom.xml
@@ -77,15 +77,14 @@ limitations under the License.
</resources>
</configuration>
</execution>
-
- <!--<execution>
+ <execution>
<id>copy-scripts</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
@@ -96,8 +95,7 @@ limitations under the License.
</resource>
</resources>
</configuration>
- </execution> -->
-
+ </execution>
</executions>
</plugin>
<plugin>
@@ -237,6 +235,25 @@ limitations under the License.
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-scripts</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/scripts</directory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/cdt/src/main/docker/Dockerfile b/cdt/src/main/docker/Dockerfile
index d0ab6c8..caa6ff1 100644
--- a/cdt/src/main/docker/Dockerfile
+++ b/cdt/src/main/docker/Dockerfile
@@ -24,3 +24,5 @@ FROM httpd
MAINTAINER APP-C Team (appc@lists.openecomp.org)
COPY config-design-tool /usr/local/apache2/htdocs/
+
+COPY startCdt.sh /opt
diff --git a/cdt/src/main/scripts/installZips.sh b/cdt/src/main/scripts/installZips.sh
index 748241e..a1b6cc4 100644
--- a/cdt/src/main/scripts/installZips.sh
+++ b/cdt/src/main/scripts/installZips.sh
@@ -54,6 +54,7 @@ echo "Downloading cdt code from nexus"
mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.cdt:config-design-tool:${APPC_VERSION}:zip -DoutputDirectory=/tmp
unzip -d ${targetDir}/config-design-tool /tmp/config-design-tool*.zip
+find ${targetDir} -name '*.sh' -exec chmod +x '{}' \;
cd $cwd
diff --git a/cdt/src/main/scripts/startCdt.sh b/cdt/src/main/scripts/startCdt.sh
new file mode 100644
index 0000000..1f7f38d
--- /dev/null
+++ b/cdt/src/main/scripts/startCdt.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+CDT_PORT=${CDT_PORT:-30232}
+echo "Setting CDT port to $CDT_PORT"
+sed -i -e "s/30290/$CDT_PORT/" /usr/local/apache2/htdocs/main.bundle.js
+
+exec /usr/local/bin/httpd-foreground \ No newline at end of file