From cc805e781c5c764860a1f801e637c6ed6e471f63 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 26 Jul 2017 18:04:56 -0400 Subject: [PATCH] Prepare to deploy widget-ms docker container in Rackspace Restore hardcoded image name ep:1610-1 due to demo/boot script file dependencies. Store image and container names in settings file; push and tag image for WMS at same time as portal and db. Issue: PORTAL-30 Change-Id: I349bfb91676dda0b4f106c6cab784dc6e6cec647 Signed-off-by: Christopher Lott (cl778h) --- deliveries/build_portalapps_dockers.sh | 2 +- deliveries/createMaria.sh | 2 +- deliveries/dbstart.sh | 8 +++++++- deliveries/dbstop.sh | 11 +++++++++-- deliveries/etc.zip | Bin 11434 -> 11429 bytes deliveries/new_start.sh | 6 +++--- deliveries/new_stop.sh | 8 ++++---- deliveries/os_docker_push.sh | 25 +++++++++++++++++++------ deliveries/os_docker_release.sh | 23 ++++++++++++++++++----- deliveries/os_settings.sh | 11 ++++++++--- deliveries/widget_ms_start.sh | 9 +++++++-- deliveries/widget_ms_stop.sh | 12 ++++++++---- 12 files changed, 85 insertions(+), 32 deletions(-) diff --git a/deliveries/build_portalapps_dockers.sh b/deliveries/build_portalapps_dockers.sh index eba1cb6d..a45e55cc 100755 --- a/deliveries/build_portalapps_dockers.sh +++ b/deliveries/build_portalapps_dockers.sh @@ -101,7 +101,7 @@ fi # build portal docker cd $DELIV PORTAL_DOCKER_CMD=" - docker build -t ${IMGNAME} ${PROXY_ARGS} + docker build -t ${EP_IMG_NAME} ${PROXY_ARGS} --build-arg FE_DIR=$BUILD/public --build-arg PORTAL_WAR=$BUILD/ecompportal-be-os.war --build-arg SDK_WAR=$BUILD/epsdk-app-os.war diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh index 0b3de0b7..84e6bb38 100755 --- a/deliveries/createMaria.sh +++ b/deliveries/createMaria.sh @@ -6,4 +6,4 @@ source $(dirname $0)/os_settings.sh echo ${SCRIPT_DIR} -docker build -t ecompdb:portal --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" --build-arg SCRIPT_COMMON_DIR="${SCRIPT_COMMON_DIR}" --build-arg SDK_COMMON_SCRIPT_DIR="${SDK_COMMON_SCRIPT_DIR}" --build-arg DBC_COMMON_SCRIPT_DIR="${DBC_COMMON_SCRIPT_DIR}" -f ./Dockerfile.mariadb . +docker build -t ${DB_IMG_NAME} --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" --build-arg SCRIPT_COMMON_DIR="${SCRIPT_COMMON_DIR}" --build-arg SDK_COMMON_SCRIPT_DIR="${SDK_COMMON_SCRIPT_DIR}" --build-arg DBC_COMMON_SCRIPT_DIR="${DBC_COMMON_SCRIPT_DIR}" -f ./Dockerfile.mariadb . diff --git a/deliveries/dbstart.sh b/deliveries/dbstart.sh index eaea9c18..518a5485 100755 --- a/deliveries/dbstart.sh +++ b/deliveries/dbstart.sh @@ -1,3 +1,9 @@ +#!/bin/bash + +# Establish environment variables +source $(dirname $0)/os_settings.sh + #docker create --name data_vol_portal -v /var/lib/mysql mariadb; -docker run -d --volumes-from data_vol_portal -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Aa123456 --net=host --name ecompdb_portal ecompdb:portal; +echo "Running docker image ${DB_IMG_NAME} as name ${DB_CONT_NAME}" +docker run -d --volumes-from data_vol_portal -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Aa123456 --net=host --name ${DB_CONT_NAME} ${DB_IMG_NAME}; diff --git a/deliveries/dbstop.sh b/deliveries/dbstop.sh index 319b28ba..9c5b73a7 100755 --- a/deliveries/dbstop.sh +++ b/deliveries/dbstop.sh @@ -1,2 +1,9 @@ -docker stop ecompdb_portal -docker rm ecompdb_portal +#!/bin/bash + +# Establish environment variables +source $(dirname $0)/os_settings.sh + +echo "Stopping docker container named ${DB_CONT_NAME}" +docker stop ${DB_CONT_NAME} +echo "Removing docker container named ${DB_CONT_NAME}" +docker rm ${DB_CONT_NAME} diff --git a/deliveries/etc.zip b/deliveries/etc.zip index 30e6898f7cb09162ec9fe32b92cdfd003702e75e..c03a151caacf52621530a614d62e9544cde045e9 100644 GIT binary patch delta 2150 zcmZuzcU03?8_vQgBO!tWp$R)ABo#$SSn9_f$|_5iP!+-yt3ZGP5s=w0TKzEu6$NA- zh5|(at7RGXDv%&XK#&45!x9O!@SPg^Rqs9boacR?_rA})|J>&mJLNh3OhlE@-VXjZ|76St{25njK}ZmO;19dB7mV$bgF)3JJ^=zk1T?TC z@`Vrx1Q-h2^LIZK?uGzXLbjh1K#@=$5QseeIj*cnHiJ<+9nD?baPhANK%fW_5J(a5 z5Rw2&Q4)uCHFnqkT?SyIboPbKuaCW71r8rnrr)rV=PFtd9pOG=P8m&ib1Iyt88 z4#q8AZ7N}F!gqD-X}eFIY(_&$&Xq2~!0mW&lqltWI-`?=a^XGn9o=g9Rv;$+KSxSg zHgx8h{@QlrngORNAh$%q{dZif z8tHL*e9n36Lo4aBcz5=XVNsF6SFdhuk54N}FY2d@tZTz;yH4b$J_`)u_;5aD7-km< zS2R0n2s*%_l^0#lrkh>i5l?QdaQ#D<=IQpC6fB&OlqVjm@vWVq(dF@^p#!IWtqBuM zmFxE!gmJ{~EMjM8>YJ5wPS98t0j8}i1#)ab-Wt})n9&ddSLXTGVm8<<*SqbwZe*;< zzE%X8Q5ftYeXF-r)Hp!#l5RtSJz~~IJDs5<`0!+;tVTN`J! zn!o!=&M|D>7b{Ww;Clzddp$OxRBFO9=0!fG{bF^ZdROQ3_eK*Fww9ubj48!-u4R|1 zMT-QlHGvm^8Z=W9twB~GECvjM5KSr82wF(aRZZ`byutdEt{MA7VzdHBB(tDgwP0p- zJE)4jR?V*acx7qYGjaka7B5V{&ob?Rv+YI7(Cxkz{^ThZtuHmxiGseqIjAJHMCFXA z@(wTKkMa)W_mmxwXE_^9-ERcZH$i}Uua>+F}mKBH4N*SpmF z!)rg3Px-rThQZ^SCM$;-JRlzI!wTJB-z=s>atTL~6b{)wQ}9x_+5# zm(iA|8})>8QtG%wC4r|u*p!?QV%ZH5-2Ss|*yqA)bD1;o63QR^QAy&M*&wEgVUCH$ zIaxSOM>=7txD%CnBVl+bf#>EXe|j;FYu4zKQaPsCaCJiYy!~Leg3CA%8c)19i-?%~|u{DpWxk zwy)KE*%stRhxW@wRPSR&Rb&UrEK;xVo7<`k{kg^%{UCBkQil_fSY9&_X6kp`{d&kX zr-sJrkNYK&P`}{BLW7dv{kMPWCY?~+Ox%=yRv0ewjSSs7MstIC8eKS0bvVM6!?vy- z%vPCBv6V$8??mUGi0tv?xJfvuN|*2VRf{$YzE;yIIGeox(a@jQwxHHPEt)L$H6x(Qe#d|3*|I7S0E)5XC(dGy zL4iD#gMf@AnV)o(EPw$J1&uGg3NTf0;g=OFr1CupFveMZCV+c54?cz}?_uA6;9g}9 z$-i9>1hPI2hG3zBpxv?SYi4)~>Px?Y5=g+Wcr;*4kma|(g(pG05Wq3QAs|FZ8d$)K z@Tma81^Is|i0|~@zpJq4a{!lc@+(?;DkN|fa7jg;-_Darf^MThz&%+-;2CjGW?O{> ziIf6JL^XbCx(W%pg#iJwl8V5L%3f&)kp$iVHi(MIf1L}kRFD*r{NMF=J_?{m(MEs` WNn7S0RRa5VS=7!<+d&&jyU}0nUwe80 delta 2162 zcmZuyc{r47AD$U&5e7A5veTF`lXc954h_mQWH~g9y;PPcBwJ-d*0M}*!wFLf#j$-w z*^Y!mC%Za~HCwi?Fmos~Dt%m6jdMER^Ip$${eJiFe((Fe-anqZkoqe%0|SkZ4X0j= z5Cee)N0ULI&4Yf>5cV$+1hTUd5CrZb;q(H$$T#MrNqg}3y3!DWh47mI!E@Wqq_B#h zKw&%&5E4W09ViQ@4sY&%SbkIAK*51n3F3DZpk1O6uobiV-dE;{^+13ywDcxvH&B9> z0g5G|{9%)1D;T=zLXOfct{4{rfns)nKVSa`X1JTYq( zkdxM+{jLFxy!n7p5?7U6YCUz#o>~?*%i__oy~|4Sua=sXjnwvEZo!E6rIlOBt+qsmJXvRt%v8B&*qk8S8~Vf( zXf0sVq@2Gx+GdxM_DA>P*wK@jkfY`*Sp)BUY2HZxv3`+HdFQ5{+EcDqoR%SeQr2|e zn<&fU2H{RxQy6w_PLy&Bxss-eapoI#&QqJ(N5j|22||K?C{5u@MB0wnl!S(?IhGTF zz*;uF*eG5XD{jmS#`%>yj?KgIQ80A zo7R&6TlOf7oK_(n-Ct-?>X)aAFoWBU+He=Tx*Uqc^YE3(`8&1R2ui=O) zQ4H-!3vT#K)YXmE6B9V^xU9llYL{m#ZHbK`nD325Vv@BJ%w}p!BAw@>~#MhEzig2`iZ}I$&!^%)s3TupP!fHR4oU*&0eI)rXxm7>8y}{xHHFm+TXg zvNAIm9ZGH@_Bvaw#G#q}C7OGdY$_Cge^{aY@V_56LaS&WpAOb@LpTekue_xpWfFEW zS*T7C?(tn|unzyf0`T)J$ybbQDgk!w(|`(s<1;p{{aJ3sS7&O+gWmETsw|hoi_ASn zWXUKme1wqwM4h92K4Ye;*$nq&Y}OxY_JOIkHqV_uu$Y=u#R~q~rb3PA$*tGV#yF82 z9*6B4-o0;}Ac`~H&kKw^kDzshucamE%W!@C9zig~fY!L_2abrBa~Q4KiqJD5K(Lz{ zJwq#z4tF5Dy+@^1$7&W_5facmk%r<=Lm?tR?nKG{7`kJOm58jCO4IV!!5{8a`Lq^R_;-}u%Rq0$mC4NS|v7zA?6L<>;-lliy&&XOg!bp>myfZBsMwjWh@lvI;hnsKJj#QDZ zSn4R47b#yxp7nSqPk~K@_Zs+e^`A}F9X4S2XvK~UjlHsy(ynIGCOGq+H$-4P77i~Q z);+ZpgT7pXw4D}sHZ6KamKYjCi~8e(P+1;DhX);wX+sCf8N9zkXc=e^D)xcv7FXfJ z;B>66_~=dTRI}xl*q=l3Hp!h-45p&CKazA--}Bl>aHYkyz!kcVmhix^R9}Mgh*SZr zf?7xVNM9oa^{vtn2Tblkf>YA7w0evDFx;B@;Clg!=AME1EF9!1nH8ui$ZOQAku35> zw#0u{6v^!F?aF@7Nn28kIjod}^^+BfiWE$g4zmm~_Kle{TRX{1Ydcp>R9^_FGN$9l zMg70T&Ydrr-IxjpU7gF}txzMr{I>oseQrZ`ZCP1@vqW>Q;J#v*wh}$21Yf`Hw!adT zznVG&nms1x*)uQFzV?YR*RuF*A9B!o;7@{b! z6STFq0?z_PfNllPKf(_9h{6IjC>UUfM)Boups)}Nao_}MH_(Gp=EJ^dZ`B{vWjD1& zx74?T4p>B+{2!l#nplBa7zpTt$pF!syZEAB7%W5p4y0l9_z-WC`c)nTWFyo8Ys@zF zrY06bQwE-EZc|@iu;2|~6{F67SqX~;lL2e2k<#BjRY-X2CqOr!%*|?J-&XfOaE-zk diff --git a/deliveries/new_start.sh b/deliveries/new_start.sh index 0710c83d..cffcda9b 100755 --- a/deliveries/new_start.sh +++ b/deliveries/new_start.sh @@ -11,8 +11,8 @@ PORTALPROPDIR=ECOMPPORTALAPP SDKAPPPROPDIR=ECOMPSDKAPP DBCAPPPROPDIR=ECOMPDBCAPP #docker rm ep_1610 -echo "Running docker image ${IMGNAME} as name ${CONTNAME}" -docker run -d --name ${CONTNAME} \ +echo "Running docker image ${EP_IMG_NAME} as name ${EP_CONT_NAME}" +docker run -d --name ${EP_CONT_NAME} \ -p 8989:8080 -p 8010:8009 -p 8006:8005 \ -v ${BASEDIR}/etc/${PORTALPROPDIR}/system.properties:${PORTALDIR}/WEB-INF/conf/system.properties \ -v ${BASEDIR}/etc/${PORTALPROPDIR}/fusion.properties:${PORTALDIR}/WEB-INF/fusion/conf/fusion.properties \ @@ -26,4 +26,4 @@ docker run -d --name ${CONTNAME} \ -v ${BASEDIR}/etc/${DBCAPPPROPDIR}/dbcapp.properties:${DBCAPPDIR}/WEB-INF/dbcapp/dbcapp.properties \ -v ${BASEDIR}/etc/${DBCAPPPROPDIR}/fusion.properties:${DBCAPPDIR}/WEB-INF/fusion/conf/fusion.properties \ -v ${BASEDIR}/log:/opt/apache-tomcat-8.0.37/logs \ -${IMGNAME} +${EP_IMG_NAME} diff --git a/deliveries/new_stop.sh b/deliveries/new_stop.sh index 6c4bf7a2..7693c035 100755 --- a/deliveries/new_stop.sh +++ b/deliveries/new_stop.sh @@ -3,7 +3,7 @@ # Establish environment variables source $(dirname $0)/os_settings.sh -echo "Stopping docker container named ${CONTNAME}" -docker stop ${CONTNAME} -echo "Removing docker container named ${CONTNAME}" -docker rm ${CONTNAME} +echo "Stopping docker container named ${EP_CONT_NAME}" +docker stop ${EP_CONT_NAME} +echo "Removing docker container named ${EP_CONT_NAME}" +docker rm ${EP_CONT_NAME} diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh index 04e245cd..2c41151d 100755 --- a/deliveries/os_docker_push.sh +++ b/deliveries/os_docker_push.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Establish environment variables +source $(dirname $0)/os_settings.sh + ./run.sh REPO="nexus3.onap.org:10003" @@ -10,18 +13,28 @@ LATEST="latest" APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}" DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}" +WMS_VERSION="${REPO}/openecomp/portalwms:${VERSION}" APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}" DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}" +WMS_LATEST="${REPO}/openecomp/portalwms:${LATEST}" + +# tag versions +docker tag ${EP_IMG_NAME} ${APPS_VERSION} +docker tag ${EP_IMG_NAME} ${APPS_LATEST} -# tag version -docker tag ep:1610-1 ${APPS_VERSION} -docker tag ecompdb:portal ${DB_VERSION} -docker tag ep:1610-1 ${APPS_LATEST} -docker tag ecompdb:portal ${DB_LATEST} +docker tag ${DB_IMG_NAME} ${DB_VERSION} +docker tag ${DB_IMG_NAME} ${DB_LATEST} + +docker tag ${WMS_IMG_NAME} ${WMS_VERSION} +docker tag ${WMS_IMG_NAME} ${WMS_LATEST} # push docker push ${APPS_VERSION} -docker push ${DB_VERSION} docker push ${APPS_LATEST} + +docker push ${DB_VERSION} docker push ${DB_LATEST} + +docker push ${WMS_VERSION} +docker push ${WMS_LATEST} diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh index ba4ba235..91b5e187 100755 --- a/deliveries/os_docker_release.sh +++ b/deliveries/os_docker_release.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Establish environment variables +source $(dirname $0)/os_settings.sh + ./run.sh REPO="nexus3.onap.org:10003" @@ -10,18 +13,28 @@ LATEST="1.1-STAGING-latest" APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}" DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}" +WMS_VERSION="${REPO}/openecomp/portalwms:${VERSION}" APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}" DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}" +WMS_LATEST="${REPO}/openecomp/portalwms:${LATEST}" # tag version -docker tag ep:1610-1 ${APPS_VERSION} -docker tag ecompdb:portal ${DB_VERSION} -docker tag ep:1610-1 ${APPS_LATEST} -docker tag ecompdb:portal ${DB_LATEST} +docker tag ${EP_IMG_NAME} ${APPS_VERSION} +docker tag ${EP_IMG_NAME} ${APPS_LATEST} + +docker tag ${DB_IMG_NAME} ${DB_VERSION} +docker tag ${DB_IMG_NAME} ${DB_LATEST} + +docker tag ${WMS_IMG_NAME} ${WMS_VERSION} +docker tag ${WMS_IMG_NAME} ${WMS_LATEST} # push docker push ${APPS_VERSION} -docker push ${DB_VERSION} docker push ${APPS_LATEST} + +docker push ${DB_VERSION} docker push ${DB_LATEST} + +docker push ${WMS_VERSION} +docker push ${WMS_LATEST} diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh index f8b4f560..c4b7a95d 100755 --- a/deliveries/os_settings.sh +++ b/deliveries/os_settings.sh @@ -1,8 +1,13 @@ #!/bin/bash -#IMGNAME=ep:1610-1 -IMGNAME=onap-portal:1.1.0 -CONTNAME=ep-1.1.0 +# This docker image name is hardcoded at the ONAP demo repository, +# so changing it is nontrivial. +EP_IMG_NAME=ep:1610-1 +EP_CONT_NAME=onap_portal +DB_IMG_NAME=ecompdb:portal +DB_CONT_NAME=ecompdb_portal +WMS_IMG_NAME=widget-ms +WMS_CONT_NAME=ecomp-portal-widget-ms VERSION=1.1.0 ETCDIR=etc WORKINGDIR=PROJECT diff --git a/deliveries/widget_ms_start.sh b/deliveries/widget_ms_start.sh index aa9da147..5e51aebe 100755 --- a/deliveries/widget_ms_start.sh +++ b/deliveries/widget_ms_start.sh @@ -1,5 +1,10 @@ +#!/bin/sh + +# Establish environment variables +source $(dirname $0)/os_settings.sh + 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 8082:8082 -v ${BASEDIR}/etc/${WIDGETMSAPPPROPDIR}/application.properties:/application.properties widget-ms +echo "Running docker image ${WMS_IMG_NAME} as container ${WMS_CONT_NAME}" +docker run -d --name ${WMS_CONT_NAME} -p 8082:8082 -v ${BASEDIR}/etc/${WIDGETMSAPPPROPDIR}/application.properties:/application.properties ${WMS_IMG_NAME} diff --git a/deliveries/widget_ms_stop.sh b/deliveries/widget_ms_stop.sh index 8c9abf56..dd5c9645 100755 --- a/deliveries/widget_ms_stop.sh +++ b/deliveries/widget_ms_stop.sh @@ -1,5 +1,9 @@ -echo "Stopping ecomp-portal-widget-ms container !!!" -docker stop ecomp-portal-widget-ms -echo "Removing docker image portal-widget-ms !!!" -docker rm ecomp-portal-widget-ms +#!/bin/bash +# Establish environment variables +source $(dirname $0)/os_settings.sh + +echo "Stopping docker container ${WMS_CONT_NAME}" +docker stop ${WMS_CONT_NAME} +echo "Removing docker image ${WMS_CONT_NAME}" +docker rm ${WMS_CONT_NAME} -- 2.16.6