Merge "Add proxy support in DockerFile"

diff --combined deliveries/os_build_febe.sh
index a87831a,2d6117c..2d6117c
mode 100755,100644..100755
--- 1/deliveries/os_build_febe.sh
--- 2/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@@ -84,5 -84,14 +84,14 @@@ cat dbca-create-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

diff --combined deliveries/os_settings.sh
index d4ab185,0ad53fd..0ad53fd
mode 100755,100644..100755
--- 1/deliveries/os_settings.sh
--- 2/deliveries/os_settings.sh
+++ b/deliveries/os_settings.sh
@@@ -1,3 -1,5 +1,5 @@@
+ #!/bin/bash
+ 
  IMGNAME=ep:1610-1
  VERSION=1.1.0-SNAPSHOT
  ETCDIR=etc