Commit 5e6dcf2d authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '25-add-registry-name-in-all-docker-images' into 'main' 

Resolve "Add registry name in all Docker images"

Closes #25

See merge request to-be-continuous/defectdojo!38
parents 419fb6bf 23a6754d

README.md

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Depending on the security tools you launch, and their configuration, you may hav 
| `DEFECTDOJO_SONARQUBE_SINCELEAKPERIOD` | determines if delta analysis is activated          | false                         |

| `DEFECTDOJO_SONARQUBE_NOSECURITYHOTSPOT` | if true, disable hotspots processing           | true                         |

| `DEFECTDOJO_SONARQUBE_ALLBUGS ` | true if all bugs are returned, false if only vulnerabilities are returned | false                         |

| `DEFECTDOJO_BASE_IMAGE` | Alpine base image           | node:alpine3.11                         |

| `DEFECTDOJO_BASE_IMAGE` | Alpine base image           | `registry.hub.docker.com/library/node:alpine3.11`                         |

| `DEFECTDOJO_SMTP_SERVER` | name:port of SMTP server used for notifications            | dist                         |

| `DEFECTDOJO_NOTIFICATION_SEVERITIES` | list of (comma separated) severities to be notified on            | Critical,High                         |

| `DEFECTDOJO_TIMEZONE` | timezone used for naming engagements and setting engagements start and end | `Europe/Paris`                  |

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "DEFECTDOJO_BASE_IMAGE",

      "description": "The Docker image used to run import",

      "default": "node:alpine3.11"

      "default": "registry.hub.docker.com/library/node:alpine3.11"

    },

    {

      "name": "DEFECTDOJO_SERVER_URL",

templates/gitlab-ci-defectdojo.yml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ variables: 
  DEFECTDOJO_SONARQUBE_SINCELEAKPERIOD: "false"

  DEFECTDOJO_SONARQUBE_NOSECURITYHOTSPOT: "true"

  DEFECTDOJO_SONARQUBE_ALLBUGS: "false"

  DEFECTDOJO_BASE_IMAGE: "node:alpine3.11"

  DEFECTDOJO_BASE_IMAGE: "registry.hub.docker.com/library/node:alpine3.11"

  DEFECTDOJO_NOTIFICATION_SEVERITIES: "Critical,High"

  DEFECTDOJO_TIMEZONE: "Europe/Paris"

  # default production ref name (pattern)