Merge "Update docker installation documentation"

1 files changed, 77 insertions, 39 deletions

diff --git a/docs/installation/docker.rst b/docs/installation/docker.rst
index d9ddd1a1..7f038934 100644
--- a/docs/installation/docker.rst
+++ b/docs/installation/docker.rst
@@ -10,98 +10,136 @@ Policy Docker Installation
     :depth: 2
 
 
-Building the ONAP Policy Framework Docker Images
+Starting the ONAP Policy Framework Docker Images
 ************************************************
-The instructions here are based on the instructions in the file *~/git/onap/policy/docker/README.md*.
+In order to start the containers, you can use *docker-compose*. This uses the *docker-compose-all.yml* yaml file to bring up the ONAP Policy Framework. This file is located in the policy/docker repository. In the csit folder there are scripts to *automatically* bring up components in Docker, without the need to build all the images locally.
 
-**Step 1:** Build the Policy API Docker image
+Clone the read-only version of policy/docker repo from gerrit:
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/api/packages
-  mvn clean install -P docker
+  git clone "https://gerrit.onap.org/r/policy/docker"
 
-**Step 2:** Build the Policy PAP Docker image
+
+Start the containers automatically
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. note:: The start-all.sh script in policy/docker/csit will bring up all the Policy Framework components, and give the local ip for the GUI. The latest images will be downloaded from Nexus.
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/pap/packages
-  mvn clean install -P docker
+  export CONTAINER_LOCATION=nexus3.onap.org:10001/
+  export PROJECT=pap
+  ./start-all.sh
 
-**Step 3:** Build the Drools PDP docker image.
 
-This image is a standalone vanilla Drools engine, which does not contain any pre-built drools rules or applications.
+To stop them use ./stop-all.sh
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/drools-pdp/
-  mvn clean install -P docker
+  ./stop-all.sh
 
-**Step 4:** Build the Drools Application Control Loop image.
 
-This image has the drools use case application and the supporting software built together with the Drools PDP engine. It is recommended to use this image if you are first working with ONAP Policy and wish to test or learn how the use cases work.
+Start the containers manually
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. code-block:: bash
+**Step 1:** Set the containers location and project.
 
-  cd ~/git/onap/policy/drools-applications
-  mvn clean install -P docker
+For *local* images, set CONTAINER_LOCATION="" (or don't set it at all)
+*You will need to build locally all the images using the steps in the next chapter*
 
-**Step 5:** Build the Apex PDP docker image:
+For *remote* images set CONTAINER_LOCATION="nexus3.onap.org:10001/"
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/apex-pdp
-  mvn clean install -P docker
+  export CONTAINER_LOCATION=nexus3.onap.org:10001/
+  export PROJECT=pap
 
-**Step 6:** Build the XACML PDP docker image:
+
+**Step 2:** Set gerrit branch
+
+Set GERRIT_BRANCH="master"
+
+Or use the script get-branch.sh
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/xacml-pdp/packages
-  mvn clean install -P docker
+  source ./get-branch.sh
 
-**Step 7:** Build the policy engine docker image (If working with the legacy Policy Architecture/API):
+
+**Step 3:** Get all the images versions
+
+Use the script get-versions.sh
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/engine/
-  mvn clean install -P docker
+  source ./get-versions.sh
 
-**Step 8:** Build the Policy SDC Distribution docker image:
+
+**Step 4:** Run the system using docker-compose
 
 .. code-block:: bash
 
-  cd ~/git/onap/policy/distribution/packages
-  mvn clean install -P docker
+  docker-compose -f docker-compose-all.yml up <image> <image>
 
 
-Starting the ONAP Policy Framework Docker Images
+**You now have a full standalone ONAP Policy framework up and running!**
+
+
+Building the ONAP Policy Framework Docker Images
 ************************************************
+If you want to use your own local images, you can build them following these instructions:
+
+**Step 1:** Build the Policy API Docker image
+
+.. code-block:: bash
 
-In order to run the containers, you can use *docker-compose*. This uses the *docker-compose.yml* yaml file to bring up the ONAP Policy Framework. This file is located in the policy/docker repository.
+  cd ~/git/onap/policy/api/packages
+  mvn clean install -P docker
 
-**Step 1:** Set the environment variable *MTU* to be a suitable MTU size for the application.
+**Step 2:** Build the Policy PAP Docker image
 
 .. code-block:: bash
 
-  export MTU=9126
+  cd ~/git/onap/policy/pap/packages
+  mvn clean install -P docker
 
+**Step 3:** Build the Drools PDP docker image.
 
-**Step 2:** Determine if you want the legacy Policy Engine to have policies pre-loaded or not. By default, all the configuration and operational policies will be pre-loaded by the docker compose script. If you do not wish for that to happen, then export this variable:
+This image is a standalone vanilla Drools engine, which does not contain any pre-built drools rules or applications.
+
+.. code-block:: bash
 
-.. note:: This applies ONLY to the legacy Engine and not the Policy Lifecycle polices
+  cd ~/git/onap/policy/drools-pdp/
+  mvn clean install -P docker
+
+**Step 4:** Build the Drools Application Control Loop image.
+
+This image has the drools use case application and the supporting software built together with the Drools PDP engine. It is recommended to use this image if you are first working with ONAP Policy and wish to test or learn how the use cases work.
 
 .. code-block:: bash
 
-  export PRELOAD_POLICIES=false
+  cd ~/git/onap/policy/drools-applications
+  mvn clean install -P docker
 
+**Step 5:** Build the Apex PDP docker image:
+
+.. code-block:: bash
+
+  cd ~/git/onap/policy/apex-pdp
+  mvn clean install -P docker
 
-**Step 3:** Run the system using *docker-compose*. Note that on some systems you may have to run the *docker-compose* command as root or using *sudo*. Note that this command takes a number of minutes to execute on a laptop or desktop computer.
+**Step 6:** Build the XACML PDP docker image:
 
 .. code-block:: bash
 
-  docker-compose up -d
+  cd ~/git/onap/policy/xacml-pdp/packages
+  mvn clean install -P docker
 
+**Step 7:** Build the Policy SDC Distribution docker image:
 
-**You now have a full standalone ONAP Policy framework up and running!**
+.. code-block:: bash
+
+  cd ~/git/onap/policy/distribution/packages
+  mvn clean install -P docker