X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_build_febe.sh;h=fa66f267cd1e8734f2769eda820d604d1bce2dcc;hb=335773f2cb017ee1ce0dbe173a2da1819c083bfd;hp=7f6fc4c8a2076f2d8a549166734fbaa2ec868791;hpb=6a62e917a5f9f6a69fe8e1f56c29abd9d98cba37;p=portal.git

diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
old mode 100644
new mode 100755
index 7f6fc4c8..fa66f267
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -36,9 +36,6 @@ cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk
 shopt -s expand_aliases
 source ~/.bashrc
 
-cd $PROJECTDIR/ecomp-portal-FE-os/
-
-${MVN} clean install
 
 cd $PROJECTDIR/ecomp-portal-BE-common
 
@@ -55,7 +52,11 @@ cd $PROJECTDIR/ecomp-sdk/epsdk-app-os
 
 ${MVN} install
 
-mv target/epsdk-app-os-1.1.0-SNAPSHOT target/ep-sdk-app
+cd $PROJECTDIR/ecomp-portal-FE-os/
+
+${MVN} install
+
+mv target/epsdk-app-os-1.1.0 target/ep-sdk-app
 
 # now install DBC app
 cd $SOURCEDIR
@@ -76,9 +77,22 @@ cd dbca-os/target
 
 mv  dmaap-bc-app-os-1.1.0-SNAPSHOT ep-dbc-app
 
+# Build complete database script in the "OS" script area
+cd ../db-scripts
+cat dbca-create-mysql-1707-os.sql ../../dbca-common/db-scripts/dbca-ddl-mysql-1707-common.sql dbca-dml-mysql-1707-os.sql > dbca-complete-mysql-1707-os.sql
+
 
 # install into docker
 cd $CURRENTDIR
 
-echo "running: docker build -t ${IMGNAME}  --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
-docker build -t ${IMGNAME}  --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile .
+PROXY_ARGS=""
+if [ $HTTP_PROXY ]; then
+    PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+    PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+fi
+
+EXEC_CMD="docker build -t ${IMGNAME} ${PROXY_ARGS} --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
+echo $EXEC_CMD
+$EXEC_CMD
\ No newline at end of file