summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2016-12-13 01:54:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-13 01:54:06 +0000
commit888658027b97c0df51af8bea749a1e8444536cdb (patch)
treed302136867307a160821f4d2688fab9dc6e54474
parent098f6a3ccd606adb3f266e9324ef67368fe420d1 (diff)
parent046c4406619fd3c66a892993e9d0ac0dea6d32d8 (diff)
Merge "Add more document and fix dockerfile for CentOS"
-rw-r--r--docker/Dockerfile.centos73
-rw-r--r--docs/dovetailtool/dovetail.tool.installation.rst12
2 files changed, 12 insertions, 3 deletions
diff --git a/docker/Dockerfile.centos7 b/docker/Dockerfile.centos7
index 965c535b..0107cb7b 100644
--- a/docker/Dockerfile.centos7
+++ b/docker/Dockerfile.centos7
@@ -5,7 +5,8 @@ LABEL version="0.1" description="OPNFV Dovetail Docker Container"
ARG BRANCH=master
RUN yum update -y && yum install -y sudo iproute epel-release && \
- yum install -y python-pip git && \
+ yum install -y python-pip git docker && \
+ sed -ie 's/requiretty/!requiretty/g' /etc/sudoers && \
pip install pyyaml click jinja2
ENV HOME /home/opnfv
diff --git a/docs/dovetailtool/dovetail.tool.installation.rst b/docs/dovetailtool/dovetail.tool.installation.rst
index 3c145059..93871e76 100644
--- a/docs/dovetailtool/dovetail.tool.installation.rst
+++ b/docs/dovetailtool/dovetail.tool.installation.rst
@@ -131,8 +131,16 @@ Pull Dovetail Docker image from public Dockerhub
<Tag> here is the version, 'latest' is used for the master branch.
-As an alternative way, you can build own docker image from Dockfile(s) under ``docker/`` directory,
-``Dockerfile`` is based on ubuntu system and ``Dockerfile.centos7`` is for centos7.
+(Optional) Create Docker image from Dockerfile
+-----------------------------------------------
+Instead of an official Docker image, you can build your own Docker image from
+Dockerfile(s) located under the ``docker/`` directory. The ``Dockerfile``
+is based on Ubuntu and the ``Dockerfile.centos7`` file is for a CentOS based
+Docker image.
+
+::
+
+ sudo docker build -t <your_new_image_name> -f <your_Dockerfile> .
Dovetail Docker container creation
----------------------------------