Merge pull request #14426 from DefectDojo/bugfix

Release 2.56.0: Merge Bugfix into Dev

Author: rossops

.github/workflows/update-sample-data.yml

@@ -24,30 +24,20 @@ jobs:
         run: |
           scripts/fixture-updater.py dojo/fixtures/defect_dojo_sample_data.json
           mv output.json dojo/fixtures/defect_dojo_sample_data.json
+          ./fixture-updater dojo/fixtures/defect_dojo_sample_data_locations.json
+          mv output.json dojo/fixtures/defect_dojo_sample_data_locations.json
 
       - name: Configure git
         run: |
           git config --global user.name "${{ env.GIT_USERNAME }}"
           git config --global user.email "${{ env.GIT_EMAIL }}"
 
-      - name: Create and switch to a new branch
-        run: |
-          git checkout -b update-file-$(date +%Y%m%d%H%M%S)
-          git add dojo/fixtures/defect_dojo_sample_data.json
-          git commit -m "Update sample data"
-
-      - name: Push branch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)
-
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update sample data"
-          branch: ${{ github.ref_name || 'dev'}}
+          branch: update-sample-data
           base: dev
           title: "Update sample data"
           body: "This pull request updates the sample data."

README.md

@@ -40,25 +40,19 @@ and reset every day. Do not put sensitive data in the demo. An easy way to test
 ## Quick Start for Docker Compose
 
 ```sh
-# Clone the project
-git clone https://github.com/DefectDojo/django-DefectDojo
-cd django-DefectDojo
+git clone https://github.com/DefectDojo/django-DefectDojo && cd django-DefectDojo && docker compose up
+```
 
-# Check if your installed toolkit is compatible
-./docker/docker-compose-check.sh
+This quick start guide will do the following
 
-# Building Docker images
-docker compose build
+- Clone the repository and change directories
+- Start the application
+- Obtain admin credentials in the initializer logs. The first initialization can take up to 3 minutes to run.
 
-# Run the application
-# (see https://github.com/DefectDojo/django-DefectDojo/blob/dev/readme-docs/DOCKER.md for more info)
-docker compose up -d
 
-# Obtain admin credentials. The initializer can take up to 3 minutes to run.
-# Use docker compose logs -f initializer to track its progress.
-docker compose logs initializer | grep "Admin password:"
-```
+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.
 
+`docker compose logs initializer | grep "Admin password:"`
 
 ## Documentation
 
@@ -70,6 +64,7 @@ docker compose logs initializer | grep "Admin password:"
     * [LDAP](https://docs.defectdojo.com/en/open_source/ldap-authentication/)
 * [Supported tools](https://docs.defectdojo.com/en/connecting_your_tools/parsers/)
 * [How to Write Documentation Locally](/docs/README.md)
+* [Development](readme-docs/DOCKER.md#run-with-docker-compose-in-development-mode-with-hot-reloading)
 
 ## Supported Installation Options