summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShobhi Jain <shobhi.jain@intel.com>2017-11-01 14:23:53 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2017-11-20 13:23:22 +0000
commit4089293fce7a32e36181062a2ba562a371916865 (patch)
treee3a3609160fc26ba142c29f95d83eb473e044947
parent558fb2137b84a11ac62601b5be22170692be365a (diff)
docker: update docker configuration
* update docker user guide Change-Id: Ia2d7ec26562e8b9feadd8a63459aac401bf18c44 Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docs/release/userguide/docker.userguide.rst3
-rwxr-xr-xsystems/build_base_machine.sh2
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6f62655..b64dd805 100644
--- 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 3fda772f..c6f56b2b 100644
--- 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 dab2e761..e78b7fe7 100755
--- 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