summaryrefslogtreecommitdiffstats
path: root/deliveries/os_build_febe.sh
diff options
context:
space:
mode:
authorShashank Kumar Shankar <shashank.kumar.shankar@intel.com>2017-06-14 15:32:06 -0700
committerShashank Kumar Shankar <shashank.kumar.shankar@intel.com>2017-07-05 10:17:55 -0700
commit47d9cadde3ea38210db0324564960a9853d863a2 (patch)
tree6256b9d33fd9e92854edc4df072087424ffd59be /deliveries/os_build_febe.sh
parent627badaf69987c01811c477219fd943757a635f5 (diff)
Add proxy support in DockerFile
This helps to build Portal Docker image behind a proxy. Change-Id: I65fdd952ef9a9060f87dbbdc5a16909c825b493e Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Diffstat (limited to 'deliveries/os_build_febe.sh')
-rw-r--r--deliveries/os_build_febe.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
index a87831af..2d6117c3 100644
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -84,5 +84,14 @@ cat dbca-create-mysql-1707-os.sql ../../dbca-common/db-scripts/dbca-ddl-mysql-17
# 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