From 850bd8afaf309bea16c7250923fd39b77ae2b459 Mon Sep 17 00:00:00 2001 From: Nguyen Hai Date: Fri, 16 Mar 2018 01:20:54 +0900 Subject: Follow the new PTI for document build For compliance with the Project Testing Interface as described in: [1] https://governance.openstack.org/tc/reference/project-testing-interface.html [2] http://lists.openstack.org/pipermail/openstack-dev/2017-December/125710.html Change-Id: I302aced3b50b038900375e9632ca7ed136f32914 --- doc/source/contributor/CONTRIBUTING.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/source/contributor') diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst index d50c34462..aae2cabd1 100644 --- a/doc/source/contributor/CONTRIBUTING.rst +++ b/doc/source/contributor/CONTRIBUTING.rst @@ -55,8 +55,8 @@ should inherit from the provided ``openstack-base`` image, while supporting and infrastructure services (for example, mongodb) should inherit from ``base``. Services consisting of only one service should be placed in an image named the -same as that service, for example, ``horizon``. Services that consist of multiple -processes generally use a base image and child images, for example, +same as that service, for example, ``horizon``. Services that consist of +multiple processes generally use a base image and child images, for example, ``glance-base``, ``glance-api``, and ``glance-registry``. Jinja2 'blocks' are employed throughout the Dockerfile's to help operators @@ -67,7 +67,7 @@ Some of these blocks are free form however, there are a subset that should be common to every Dockerfile. The overall structure for a multi container service is as follows: -.. code-block: none +.. code-block:: console FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -- cgit v1.2.3