diff options
| author |   Tomofumi Hayashi <tohayash@redhat.com> | 2016-12-08 00:19:46 +0900 |
|---|---|---|
| committer | Tomofumi Hayashi <tohayash@redhat.com> | 2016-12-09 01:36:13 +0900 |
| commit | 046c4406619fd3c66a892993e9d0ac0dea6d32d8 (patch) | |
| tree | e5b44011028cbb5e3f43511c6d202b07e1bade3a | |
| parent | 3530fae4e072a5102d448304e88473fcd45d5d36 (diff) | |
Add more document and fix dockerfile for CentOS
Add how to build container from dockerfile and add missing config
for CentOS dockerfile. This fix is verified that functest/yeardstick
are called successfully under debug/proposed_tests testsuite.
Change-Id: Icb31331ecd78b8fccd69ac960c24340b605e54bf
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
| -rw-r--r-- | docker/Dockerfile.centos7 | 3 | ||||
| -rw-r--r-- | docs/dovetailtool/dovetail.tool.installation.rst | 12 |
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 29ebe895..7826f33f 100644 --- a/docs/dovetailtool/dovetail.tool.installation.rst +++ b/docs/dovetailtool/dovetail.tool.installation.rst @@ -115,8 +115,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 ---------------------------------- |