Updated commands and added clarity to specific question.s

Author: aaronweaver

DOCKER.md

@@ -1,8 +1,8 @@
 # Running with Docker Compose
 
-Docker compose is not intended for production use.
-If you want to deploy a containerized DefectDojo to a production environment,
-use the [Default installation](setup/README.md) approach.
+The docker-compose.yml in this repo is not intended for production use without first customizing it to fit your specific situation.  Please consider the docker-compose.yml files are templates to create on that fits your needs.
+Docker Compose is acceptable if you want to deploy a containerized DefectDojo to a production environment.
+It is one of the supported [Default installation](setup/README.md) methods.
 
 # Prerequisites
 *  Docker version
@@ -114,7 +114,7 @@ docker-compose up
 
 This will run the application based on merged configurations from docker-compose.yml and docker-compose.override.ptvsd.yml.
 
-The default configuration assumes port 3000 by default for ptvsd, and you should access the DefectDojo UI on port 8000 instead of port 8080, as the uwsgi container will serve directly.
+The default configuration assumes port 3000 by default for ptvsd.
 
 ### VS code
 Add the following python debug configuration (You would have to install the `ms-python.python`. Other setup may work.)
@@ -198,26 +198,33 @@ docker-compose down --volumes
 ```
 
 # Run with docker using https
+## use your own  Credentials
 To secure the application by https, follow those steps
 *  Generate a private key without password
 *  Generate a CSR (Certificate Signing Request)
 *  Have the CSR signed by a certificate authority
 *  Place the private key and the certificate under the nginx folder
-*  Replace nginx/nginx.conf by nginx/nginx_TLS.conf
-*  In nginx.conf, update that part: 
+*  copy your secrets into: 
 ```
         server_name                 your.servername.com;
-        ssl_certificate             /yourCertificate.cer;
-        ssl_certificate_key         /yourPrivateKey.key;
+        ssl_certificate             /etc/nginx/ssl/nginx.crt
+        ssl_certificate_key        /etc/nginx/ssl/nginx.key;
 ```
+*set the GENERATE_TLS_CERTIFICATE != True in the docker-compose.override.https.yml
 * Protect your private key from other users: 
 ```
 chmod 400 nginx/*.key
 ```
-* Rebuild the nginx image in order to place the private key and the certificate where nginx will find them (under / in the nginx container):
 
-```docker build  -t defectdojo/defectdojo-nginx -f Dockerfile.nginx .```
+* Run defectDojo with: 
+```
+rm -f docker-compose.override.yml
+ln -s docker-compose.override.https.yml docker-compose.override.yml
+docker-compose up
+```
 
+## create Credentials on the fly
+* you can generate a Certificate on the fly (without valid domainname etc.)
 
 * Run defectDojo with: 
 ```
@@ -226,7 +233,7 @@ ln -s docker-compose.override.https.yml docker-compose.override.yml
 docker-compose up
 ```
 
-The default https port is 8083.
+The default https port is 8443.
 
 To change the port:
 - update `nginx.conf`
@@ -236,14 +243,14 @@ To change the port:
 NB: some third party software may require to change the exposed port in Dockerfile.nginx as they use docker-compose declarations to discover which ports to map when publishing the application.
 
 
-# Run the unit-tests with docker
-## Introduction
+# Run the tests with docker
 The unit-tests are under `dojo/unittests`
 
+The integration-tests are under `tests`
 
 
-## Running the unit-tests 
-This will run all the tests and leave the uwsgi container up: 
+## Running the unit-tests
+This will run all unit-tests and leave the uwsgi container up: 
 
 ```
 cp dojo/settings/settings.dist.py dojo/settings/settings.py
@@ -273,6 +280,15 @@ Run a single test. Example:
 python manage.py test dojo.unittests.test_dependency_check_parser.TestDependencyCheckParser.test_parse_without_file_has_no_findings --keepdb
 ```
 
+## Running the integration-tests
+This will run all integration-tests and leave the containers up: 
+
+```
+cp dojo/settings/settings.dist.py dojo/settings/settings.py
+docker/setEnv.sh integration_tests
+docker-compose up
+```
+
 # Checking Docker versions
 
 Run the following to determine the versions for docker and docker-compose: