aboutsummaryrefslogtreecommitdiff
path: root/doc/source/contributor
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-20 10:21:01 +0000
committerGerrit Code Review <review@openstack.org>2018-03-20 10:21:01 +0000
commit38f21c364bfd4633df39b144955bd991a0b0990d (patch)
tree1ee77e911eb8eed9bb25cef08e37cc89188b919e /doc/source/contributor
parent9e60cdf27cd5f7143e42599ae109cf819ba1d463 (diff)
parent850bd8afaf309bea16c7250923fd39b77ae2b459 (diff)
downloadkolla-38f21c364bfd4633df39b144955bd991a0b0990d.tar.gz
kolla-38f21c364bfd4633df39b144955bd991a0b0990d.zip
Merge "Follow the new PTI for document build"
Diffstat (limited to 'doc/source/contributor')
-rw-r--r--doc/source/contributor/CONTRIBUTING.rst6
1 files changed, 3 insertions, 3 deletions
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 }}"