Updates to Docker packaging to fix structure and flexibility

- Updated main POM file properties to include docker build directory
- Added new service to ./packaging/docker-compose.yml file which extends the
  services in the ./packaging/docker-build/docker-compose.yml. This allows
  packages to be built using the commands:
   'docker-compose build reaper-build-packages && docker-compose run reaper-build-packages'
- Renamed ./packaging/docker to ./packaging/docker-services to better reflect
   the directory contents and to separate it from the ./packaging/docker-build directory
- Updated site documentation to match new structure

Author: ossarga

.gitignore

@@ -28,4 +28,4 @@ src/ui/node_modules
 src/ui/package-lock.json
 
 # Docker Compose persistent storage directory
-src/packaging/docker
+src/packaging/data

src/docs/content/docs.md

@@ -4,11 +4,9 @@
 
 See the [download](/download/) section for information on how to download and install reaper.
 
-
 ## Community
 
-We have a [Mailing List](https://groups.google.com/forum/#!forum/tlp-apache-cassandra-reaper-users) and [Gitter chat](https://gitter.im/thelastpickle/cassandra-reaper) available.  
-
+We have a [Mailing List](https://groups.google.com/forum/#!forum/tlp-apache-cassandra-reaper-users) and [Gitter chat](https://gitter.im/thelastpickle/cassandra-reaper) available.
 
 ## Configuration
 
@@ -358,41 +356,65 @@ Source code for all the REST resources can be found from package com.spotify.rea
     Delete all the related repair runs before calling this endpoint.
 
 
-## Running through Docker
+## Docker
+
+[Docker](https://docs.docker.com/engine/installation/) and [Docker Compose](https://docs.docker.com/compose/install/) will need to be installed in order to use the commands in this section.
+
+### Building Reaper Packages with Docker
+
+Building Reaper packages requires quite a few dependencies, especially when making changes to the web interface code. In an effort to simplify the build process, Dockerfiles have been created that implement the build actions required to package Reaper.
 
+To build the JAR and other packages which are then placed in the _packages_ directory run the following commands from the top level directory:
 
-### Build Reaper Docker Image
+```bash
+cd src/packaging
+docker-compose build reaper-build-packages && docker-compose run reaper-build-packages
+```
+
+### Building Reaper Docker Image
 
-First, build the Docker image and add it to your local image cache using the
-`cassandra-reaper:latest` tag:
+To build the Reaper Docker Image which is then added to the local image cache using the `cassandra-reaper:latest` tag, run the following commands from the top level directory:
 
-```mvn clean package docker:build```
+```bash
+cd src/server
+mvn package docker:build
+```
+
+Note that the above command will build the Reaper JAR and place it in the _src/server/target_ directory prior to creating the Docker Image. It is also possible to build the JAR file using the [Docker package build](building-reaper-packages-with-docker) instructions and omitting the `package` command from the above Maven commands.
 
 ### Start Docker Environment
 
-First, start the Cassandra cluster:
+From the top level directory change to the _src/packaging_ directory
+
+```bash
+cd src/packaging
+```
 
-```docker-compose up cassandra```
+Start the Cassandra cluster:
 
-You can use the `nodetool` Docker Compose service to check on the Cassandra
-node's status:
+```bash
+docker-compose up cassandra
+```
 
-```docker-compose run nodetool status```
+The `nodetool` Docker Compose service can be used to check on the Cassandra node's status:
 
-Once the Cassandra node is online and accepting CQL connections,
-create the required `reaper_db` Cassandra keyspace to allow Reaper to save
-its cluster and scheduling data.
+```bash
+docker-compose run nodetool status
+```
 
-By default, the `reaper_db` keyspace is created using a replication factor
-of 1. To change this replication factor, provide the intended replication
-factor as an optional argument:
+Once the Cassandra node is online and accepting CQL connections, create the required `reaper_db` Cassandra keyspace to allow Reaper to save its cluster and scheduling data.
 
-```docker-compose run initialize-reaper_db [$REPLICATION_FACTOR]```
+By default, the `reaper_db` keyspace is created using a replication factor of 1. To change this replication factor, provide the intended replication factor as an optional argument:
+
+```bash
+docker-compose run initialize-reaper_db [$REPLICATION_FACTOR]
+```
 
-Wait a few moments for the `reaper_db` schema change to propagate,
-then start Reaper:
+Wait a few moments for the `reaper_db` schema change to propagate, then start Reaper:
 
-```docker-compose up reaper```
+```bash
+docker-compose up reaper
+```
 
 
 ### Access The Environment
@@ -403,19 +425,27 @@ http://127.0.0.1:8080/webui/
 
 When adding the Cassandra node to the Reaper UI, use the IP address found via:
 
-```docker-compose run nodetool status```
+```bash
+docker-compose run nodetool status
+```
 
 The helper `cqlsh` Docker Compose service has also been included:
 
-```docker-compose run cqlsh```
+```bash
+docker-compose run cqlsh
+```
 
 ### Destroying the Docker Environment
 
 When terminating the infrastructure, use the following command to stop
 all related Docker Compose services:
 
-```docker-compose down```
+```bash
+docker-compose down
+```
 
 To completely clean up all persistent data, delete the `./data/` directory:
 
-```rm -rf ./data/```
+```bash
+rm -rf ./data/
+```

src/packaging/docker-compose.yml

@@ -1,10 +1,10 @@
-version: '2.2'
+version: '2.1'
 
 services:
   cassandra:
     image: cassandra:3.11
     env_file:
-      - docker/cassandra/cassandra.env
+      - ./docker-services/cassandra/cassandra.env
     mem_limit: 4g
     memswap_limit: 4g
     mem_swappiness: 0
@@ -15,32 +15,37 @@ services:
       - "9042:9042"
     volumes:
       - ./data/cassandra:/var/lib/cassandra
-      - ./docker/cassandra/jmxremote.access:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/management/jmxremote.access
-      - ./docker/cassandra/jmxremote.password:/etc/cassandra/jmxremote.password
+      - ./docker-services/cassandra/jmxremote.access:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/management/jmxremote.access
+      - ./docker-services/cassandra/jmxremote.password:/etc/cassandra/jmxremote.password
 
   cqlsh:
     image: cassandra:3.11
     command: cqlsh cassandra
     links:
       - cassandra
 
-  nodetool:
-    image: cassandra:3.11
-    entrypoint: nodetool --host cassandra --username reaperUser --password reaperPass
+  initialize-reaper_db:
+    build: ./docker-services/initialize-reaper_db
     links:
       - cassandra
 
-  initialize-reaper_db:
-    build: ./docker/initialize-reaper_db
+  nodetool:
+    image: cassandra:3.11
+    entrypoint: nodetool --host cassandra --username reaperUser --password reaperPass
     links:
       - cassandra
 
   reaper:
     image: cassandra-reaper:latest
     env_file:
-      - docker/reaper/reaper.env
+      - ./docker-services/reaper/reaper.env
     links:
       - cassandra
     ports:
       - "8080:8080"
       - "8081:8081"
+
+  reaper-build-packages:
+    extends:
+      file: ./docker-build/docker-compose.yml
+      service: build

src/packaging/docker/README.md renamed to src/packaging/docker-services/README.md

@@ -16,6 +16,7 @@
         <dropwizard.metrics.datadog.version>1.0.6</dropwizard.metrics.datadog.version>
         <cassandra.version>2.2.7</cassandra.version>
         <cucumber.version>1.2.5</cucumber.version>
+        <docker.directory>src/main/docker</docker.directory>
     </properties>
 
     <dependencies>
@@ -292,7 +293,7 @@
                 <version>1.0.0</version>
                 <configuration>
                     <imageName>cassandra-reaper</imageName>
-                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <dockerDirectory>${docker.directory}</dockerDirectory>
                     <buildArgs>
                         <SHADED_JAR>cassandra-reaper-${project.version}.jar</SHADED_JAR>
                     </buildArgs>