From c67680ada04c96a1753c037d67080c65628d32ca Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Thu, 13 Jul 2017 17:04:39 -0400
Subject: [PATCH] [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>
---
 deliveries/dbstop.sh                                  |   2 ++
 deliveries/etc.zip                                    | Bin 8769 -> 9872 bytes
 deliveries/os_Dockerfile                              |   2 +-
 deliveries/os_build_febe.sh                           |  12 +++++++++---
 deliveries/widget_ms_start.sh                         |   5 +++--
 .../client/src/views/footer/footer.tpl.html           |   3 ---
 6 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 deliveries/dbstop.sh

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 0d1a929045101fb943781b79bfd193300f4940e3..a5577c1deb9babe91e64f898d019a199cfaa7c57 100644
GIT binary patch
delta 2480
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
KOdW!LPX7i8HhPr+

delta 1392
zcmV-$1&{iWO~FL4rVtKQc|%I@U`Yq-1ONac3zN_a8I#Qr5`R`*Z`(E$eJ+0mfxH#7
z<itrD2QaoYPP?E<leG={NKoRH&4m(GlB(<d`W;fXE4SI!Vh#eByyt$Od+CFE?LQf&
zicC5EnH-<-($-nJ&HhwHna$IEM3lB^s0`XR5ASXOjN<czJkRsix*$y^Tb+4bw}uqe
zHnS~3#nx?R-GAbIG8vz4fYDy($-R{|@tLzW#G6)nzp_s8*@ZkjnjD{;#@nSvbXpqt
zhF2JhH{==_XnUXCuHXN0Gw%;kr`C;Vtu?~yzu<tMq)Yi_@A7cWmOp74c)zqOfux~O
zN#iNmD1@U;eQ+OKm#(!kB)*nS1oA<&<g`VKd~!M-Gk+%ARw(UTBiEuqHJ-%}hxiV)
zySlu)z32CR$trEgi&lmuq&ezKfn5HPii@`OIDgI)TwL7W=LyT;I?$IOVtt{L#P@ga
zK3v?e171_paZe%WX5m>piBBE5J_`QiXO@)aGRPj^IyBe?jj*CaVQeX5qF?d($E%m4
z>$k7+s(<qk<WVh;IUC(WMKXjizH>X{NaTB{48iH53p7xe@d5018{&7WgK&4ceM;F^
z5i1aBL*An+=xKO5z!`rze;WC%lNm2m_Cr3t%?z3w*gT<jiS1<;r$}hESGdU-AJ$s1
zO;IH~6DffH3}K)@V+U7_EDZ5isXP4E7HA_cWq&L2MaNKiWgQPo8djLq2`4BiC%Pua
z_T#`xSuPXpE4}D>kvO~ayW>QJ<O!XXWwp`sD;>%mdOzMCVXRaFnfoAJ=-L5d6F@4-
z-Yiv}F>%!}MWtJ}sc?_9-ij|?-^|tP<N5gb<(vBG`pfmlD|cpRGlmLXIuzzT{HiXE
zlz)q!^&b6(LE46xu?rD#-%7WbF@L`K`;|Xu9t}o3LDyuvASxo2w4e3RaeguYvx8R<
z1x}6P*ut!eCmclQ%u}wGA+$fZozJFc(|oWZ@<GS_?-t3zdui>XCa!EPb;J6T=ua{E
zp+TVeMZ+JOPr4(1cyu-@bl{(*!3nGcv40g0mg`0llCRcWa^F&^D_wHDIEj$9f|218
zgl22(8mf>E6*Q;-aSevRat5^zOYJxA>dpsV5MLlXhuyBYME$x}_1{Axcx(V1a;U~*
z?+Ak#qOrTiz$}u{*pd9<;d;I`hVdAsGJDi{wOVCer`1lDH578D8*sHLNkkcstbd#F
z>9{DT$I}<1!!ezXj;9rkriZ7+NR_IRa{A(EayDTsRa5w-bdeR?bsnD)H2nXycVmr_
zkv`}WD^9v{nTV7E+}KW!h{TTSyg&^epX~|Ls4b8cCE?TTL;Y@VP$k3?>lvHZ#hRl(
zNKBPhMJgaE9v1~W2!xzB@7(2i{(k@;J};{-pOb$Kw#_3T((AGhjX!v3E{G2{Z0DB(
zSv^v!)PB%$#0ptH3IcD9kV>JVJ|g-;{${ife!qUK7YW@|cHd&`JA&CTBo>4h(s4%>
ztS-TCywafIFZhP%7S&Xq*#z!)cTYnRdHK`?PsaaZJlHf7ol8^tUoN(|fq(62Tz23)
zMzD+#Bp3LPzxjrO-cT=?{S56u<2+tzHQM|V8ueC2D=M&Ja%oKJFd|uD8Q2wHX@%a0
zWlYhUv?WSwjBGt|LsiI~UMxfZ17?K?`{pBIJPfS2A(9QTvmv5hdS>H8a*VwH0hdhg
zfRmH)-%v{f1QY-O0002Qx{(YUv*8w22($ko!vYRfc|%I@U`Yq-1ONac3zN_!Vgkt(
ylQbnf0{0b@1Q#QdiXse?p(P#yV;PgdB_$LE1^@s601W^Q0Otb$07M=D00028*P09f

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>
-- 
2.16.6