Skip to content
Permalink
Browse files

Merge pull request #1642 from Maffooch/master_install

[Master] Modify installation README's
  • Loading branch information
Maffooch committed Nov 9, 2019
2 parents ae2f439 + a7f1fed commit 08946726bf6f4fcde07a18044644a62f7ec94e36
Showing with 14 additions and 111 deletions.
  1. +1 −1 DOCKER.md
  2. +2 −3 README.md
  3. +9 −1 docker/setEnv.sh
  4. +0 −102 setup.bash
  5. +2 −4 setup/README.MD
@@ -2,7 +2,7 @@

Docker compose is not intended for production use.
If you want to deploy a containerized DefectDojo to a production environment,
use the [Helm and Kubernetes](KUBERNETES.md) approach.
use the [Default installation](setup/README.md) approach.

## Prerequisites
* Docker version
@@ -40,9 +40,9 @@ Navigate to <http://localhost:8080>.
For detailed documentation you can visit
[Read the Docs](https://defectdojo.readthedocs.io/).

## Installation Options
## Supported Installation Options

* [Kubernetes](KUBERNETES.md)
* [Setup.bash](setup/README.md)
* [Docker](DOCKER.md)

## Getting Started
@@ -143,7 +143,6 @@ Proceeds are used for testing, infrastructure, etc.
[![SDA-SE](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/sda-se-logo.png)](https://sda-se.com/)
[![Signal-Iduna](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/signal-iduna.png)](https://signal-iduna.de/)


Interested in becoming a sponsor and having your logo displayed? Please review
our [sponsorship information](SPONSORING.md) or email greg.anderson@owasp.org

@@ -20,7 +20,15 @@ function show_current {
function get_current {
if [ -L ${override_link} ]
then
current_env=$(expr $(basename $(readlink -f docker-compose.override.yml)) : "^docker-compose.override.\(.*\).yml$")
# Check for Mac OSX
if [[ "$OSTYPE" == "darwin"* ]]; then
# readlink is not native to mac, so this will work in it's place.
symlink=$(python3 -c "import os; print(os.path.realpath('docker-compose.override.yml'))")
else
# Maintain the cleaner way
symlink=$(readlink -f docker-compose.override.yml)
fi
current_env=$(expr $(basename symlink) : "^docker-compose.override.\(.*\).yml$")
else
current_env=release
fi

This file was deleted.

@@ -27,7 +27,7 @@ All installs make these assumption:
* * Running setup.bash without editing template-env assumes a single-server install.
* * Running setup.bash without editing template-env non-interactively assumes a single-server install with MySQL
* Any install configuration variable can be overridden by setting an environmental variable
* One of the following OSes is used as the base for the install
* One of the following Operating Systems is used as the base for the install
* * Ubuntu Linux - officially supported versions: 16.04 LTS, 18.04 LTS
* * CentOS - officially supported versions: ?
* * Mac OS X - officially supported versions: ?
@@ -66,7 +66,7 @@ setup.bash => the main install program
├── prompt.sh
```

Install configuration is in config-vars.sh contains the following install options and default values:
Install configuration is in [config-vars.sh](scripts/common/config-vars.sh) contains the following install options and default values:

**Format for this list:** *install option* [default value] - *definition*

@@ -94,7 +94,6 @@ Install configuration is in config-vars.sh contains the following install option

Configuration items for setup.py are in template-env in ./dojo/settings/ and contain

*

### Installers workflow

@@ -111,6 +110,5 @@ Configuration items for setup.py are in template-env in ./dojo/settings/ and con
* REPO_BASE : The full path to where the DefectDojo source was cloned usually /opt/dojo/django-DefectDojo
* LIB_PATH : The full path to where the configuration values and libraries are for the DefectDojo installer which is SETUP_BASE + /scripts/common/
* DB_TYPPE : The database type DefectDojo will use - currently either SQLite, MySQL or PostgreSQL
*


0 comments on commit 0894672

Please sign in to comment.
You can’t perform that action at this time.