aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Smith <daniel.smith@ericsson.com>2016-01-20 13:24:12 -0500
committerStefan Berg <sfb@consultron.com>2016-01-29 13:59:45 +0100
commitb65326f28448764f8993ceb856030615f68a9dfc (patch)
tree5e936d434271aa065c854c3c9e9b529ff4fa2395
parent54413253d4ad3f0f594997792a0f1dd3c1ba4788 (diff)
Small updates to build-requirements for docker stuff.
fixed whitespace x2 Change-Id: Ie9d52f820400df10d88ade035f2900aecab0c66d JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com> (cherry picked from commit 5efee382a2457f32e6202214247d76098b8bb45b)
-rw-r--r--docs/build-instruction.rst16
1 files changed, 11 insertions, 5 deletions
diff --git a/docs/build-instruction.rst b/docs/build-instruction.rst
index b7b13c896..1bfc8bed6 100644
--- a/docs/build-instruction.rst
+++ b/docs/build-instruction.rst
@@ -41,6 +41,9 @@ Version history
| | | (Ericsson AB) | for plugin build |
| | | | selection |
+--------------------+--------------------+--------------------+----------------------+
+| 2016-01-20 | 1.2.1 | Daniel Smith | Minor updates for |
+| | | (Ericsson AB) | docker requirements |
++--------------------+--------------------+--------------------+----------------------+
Introduction
============
@@ -66,6 +69,8 @@ Minimum Hardware Requirements
- An x86_64 host (Bare-metal or VM) with Ubuntu 14.04 LTS installed
+ - Note: Builds on Wily (Ubuntu 15.x) are not supportted currently
+
- ~30 GB available disc
- 4 GB RAM
@@ -77,9 +82,9 @@ The build host should run Ubuntu 14.04 operating system.
On the host, the following packages must be installed:
-- docker - see https://docs.docker.com/installation/ubuntulinux/ for
+- docker - see https://docs.docker.com/engine/installation/ubuntulinux/ for
installation notes for Ubuntu 14.04. Note: only use the Ubuntu stock
- distro of Docker (docker.io)
+ distro of Docker (docker-engine). Tested against ver 1.9.x and greater
- git (simply available through sudo apt-get install git)
@@ -94,16 +99,17 @@ Setting up the Docker build container
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
After having installed Docker, add yourself to the docker group:
-<usermod -a -G docker [userid]>
+<sudo usermod -a -G docker [userid]>
Also make sure to define relevant DNS servers part of the global dns chain in
-in your </etc/default/docker> configuration file, for example:
+in your </etc/default/docker> configuration file. Uncomment, modify the values appropriately
+and save and quit the file. For example:
<DOCKER_OPTS=" --dns=8.8.8.8 --dns=8.8.8.4">
Then restart docker:
-<sudo service docker.io restart>
+<sudo service docker restart>
Setting up OPNFV Gerrit in order to being able to clone the code
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~