summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-07-13 17:04:39 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-07-13 17:05:50 -0400
commitc67680ada04c96a1753c037d67080c65628d32ca (patch)
tree86d3bf466699165b1eba6ee47d8e223a26156cd9
parentd332e89eb9bbaf280604c61715422dde3542813c (diff)
[PORTAL-31] Repair defects in deployment
Includes docker build failures and footer icon Change-Id: I293f2767f36ab3fe824d8143e58e14dc2119c13e Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
-rw-r--r--deliveries/dbstop.sh2
-rw-r--r--deliveries/etc.zipbin8769 -> 9872 bytes
-rw-r--r--deliveries/os_Dockerfile2
-rwxr-xr-xdeliveries/os_build_febe.sh12
-rwxr-xr-xdeliveries/widget_ms_start.sh5
-rw-r--r--ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html3
6 files changed, 15 insertions, 9 deletions
diff --git a/deliveries/dbstop.sh b/deliveries/dbstop.sh
new file mode 100644
index 00000000..6fb7dc3f
--- /dev/null
+++ b/deliveries/dbstop.sh
@@ -0,0 +1,2 @@
+docker stop ecompdb_portal
+docker rm ecompdb_portal \ No newline at end of file
diff --git a/deliveries/etc.zip b/deliveries/etc.zip
index 0d1a9290..a5577c1d 100644
--- a/deliveries/etc.zip
+++ b/deliveries/etc.zip
Binary files differ
diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile
index d4bfeda2..130244da 100644
--- a/deliveries/os_Dockerfile
+++ b/deliveries/os_Dockerfile
@@ -78,7 +78,7 @@ COPY configure-and-run.sh /PROJECT/OpenSource/UbuntuEP/
#RUN cp -r ${FE_DIR}/dist/public ${PORTALHOME}/public
-COPY ${FE_DIR}/dist/public ${PORTALHOME}
+COPY ${FE_DIR}/dist/public ${PORTALHOME}/public
# Define default command.
#CMD ["bash"]
CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"]
diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
index 18cfc374..c9110892 100755
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -4,9 +4,15 @@ set -e -x
source $(dirname $0)/os_settings.sh
+# Work standalone and in Jenkins.
+# Pick up Jenkins settings for this script.
# Use -B for batch operation to skip download progress output
-export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B"
-#MVN=mvn
+if [ -n "$MVN" ]; then
+ export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B"
+else
+ MVN=mvn
+fi
+
CURRENTDIR="$(pwd)"
# install ecomp portal
@@ -55,7 +61,7 @@ cp -r dmaapbc/dcae_dmaapbc_webapp $DBCDIR/dcae_dmaapbc_webapp
cd $DBCDIR/dcae_dmaapbc_webapp
${MVN} install
cd dbca-os/target
-mv dmaap-bc-app-os-1.1.0-SNAPSHOT ep-dbc-app
+mv dmaap-bc-app-os ep-dbc-app
# Build complete database script in the "OS" script area
cd ../db-scripts
diff --git a/deliveries/widget_ms_start.sh b/deliveries/widget_ms_start.sh
index 8405fe99..aa9da147 100755
--- a/deliveries/widget_ms_start.sh
+++ b/deliveries/widget_ms_start.sh
@@ -1,4 +1,5 @@
-APP_PROPERTY_LOCATION=/tmp/application.properties
+BASEDIR=/PROJECT/OpenSource/UbuntuEP
+WIDGETMSAPPPROPDIR=ECOMPWIDGETMS
echo "Starting ecomp-portal-widget-ms image in a new container !!!"
-docker run -d --name "ecomp-portal-widget-ms" -p 8083:8082 -v $APP_PROPERTY_LOCATION:/application.properties ecompportal-widget-ms
+docker run -d --name "ecomp-portal-widget-ms" -p 8082:8082 -v ${BASEDIR}/etc/${WIDGETMSAPPPROPDIR}/application.properties:/application.properties widget-ms
diff --git a/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html b/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
index b03e8da5..b79c4579 100644
--- a/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
@@ -28,9 +28,6 @@
<div id="display-inline" class="displayInline">
</div>
</div>
- <div>
- <img src="assets/images/onap-logo.png" alt="Onap Logo" class="onap-title-logo-footer" >
- </div>
</div>
</div>
</div>