shopt -s expand_aliases
source ~/.bashrc
-cd $PROJECTDIR/ecomp-portal-FE-os/
-
-${MVN} clean install
cd $PROJECTDIR/ecomp-portal-BE-common
${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
# 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