docker: update docker configuration

 * update docker user guide

Change-Id: Ia2d7ec26562e8b9feadd8a63459aac401bf18c44
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6f6265..b64dd80 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,4 @@
 FROM centos:7
-ENV http_proxy ${http_proxy}
-ENV https_proxy ${https_proxy}
 RUN yum update -y
 RUN yum install -y which sudo
 ENV DOCKER y

diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst
index 3fda772..c6f56b2 100644 (file)
--- a/docs/release/userguide/docker.userguide.rst
+++ b/docs/release/userguide/docker.userguide.rst
@@ -221,6 +221,9 @@ Build the barometer docker image
     $ sudo docker build -t barometer_image --build-arg http_proxy=`echo $http_proxy` \
       --build-arg https_proxy=`echo $https_proxy` -f docker/Dockerfile .
 
+.. note::
+   In the above mentioned ``docker build`` command, http_proxy & https_proxy arguments needs to be passed only if system is behind an HTTP or HTTPS proxy server.
+
 Check the docker images:
 
 .. code:: bash

diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index dab2e76..e78b7fe 100755 (executable)
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -63,7 +63,7 @@ else
 fi
 if [ -z ${DOCKER+x} ]; then
        if [ ! -d /lib/modules/`uname -r`/build ] ; then
-       die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
+        die "Kernel devel is not available for active kernel. It can be caused by recent kernel update. Please reboot and run $0 again."
        fi
 fi
 # download and compile DPDK and Collectd