Skip to content

Commit 9973328

Browse files
authored
Merge branch 'bugfix' into dependabot/npm_and_yarn/docs/rollup-4.59.0
2 parents d8a5894 + ff945af commit 9973328

53 files changed

Lines changed: 885 additions & 64 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,19 @@ and reset every day. Do not put sensitive data in the demo. An easy way to test
4040
## Quick Start for Docker Compose
4141

4242
```sh
43-
# Clone the project
44-
git clone https://github.com/DefectDojo/django-DefectDojo
45-
cd django-DefectDojo
43+
git clone https://github.com/DefectDojo/django-DefectDojo && cd django-DefectDojo && docker compose up
44+
```
4645

47-
# Check if your installed toolkit is compatible
48-
./docker/docker-compose-check.sh
46+
This quick start guide will do the following
4947

50-
# Building Docker images
51-
docker compose build
48+
- Clone the repository and change directories
49+
- Start the application
50+
- Obtain admin credentials in the initializer logs. The first initialization can take up to 3 minutes to run.
5251

53-
# Run the application
54-
# (see https://github.com/DefectDojo/django-DefectDojo/blob/dev/readme-docs/DOCKER.md for more info)
55-
docker compose up -d
5652

57-
# Obtain admin credentials. The initializer can take up to 3 minutes to run.
58-
# Use docker compose logs -f initializer to track its progress.
59-
docker compose logs initializer | grep "Admin password:"
60-
```
53+
if running DefectDojo in detached mode via `docker compose up -d`, obtain admin credentials from the initializer logs with the command below. Please note, the initializer can take up to 3 minutes to run.
6154

55+
`docker compose logs initializer | grep "Admin password:"`
6256

6357
## Documentation
6458

@@ -70,6 +64,7 @@ docker compose logs initializer | grep "Admin password:"
7064
* [LDAP](https://docs.defectdojo.com/en/open_source/ldap-authentication/)
7165
* [Supported tools](https://docs.defectdojo.com/en/connecting_your_tools/parsers/)
7266
* [How to Write Documentation Locally](/docs/README.md)
67+
* [Development](readme-docs/DOCKER.md#run-with-docker-compose-in-development-mode-with-hot-reloading)
7368

7469
## Supported Installation Options
7570

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.55.4",
3+
"version": "2.56.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

docs/assets/images/pq_ss1.png

542 KB
Loading

docs/assets/images/pq_ss10.png

188 KB
Loading

docs/assets/images/pq_ss11.png

191 KB
Loading

docs/assets/images/pq_ss12.png

258 KB
Loading

docs/assets/images/pq_ss13.png

123 KB
Loading

docs/assets/images/pq_ss2.png

174 KB
Loading

docs/assets/images/pq_ss3.png

135 KB
Loading

docs/assets/images/pq_ss4.png

281 KB
Loading

0 commit comments

Comments
 (0)