Merge pull request #9142 from DefectDojo/release/2.29.2

Release: Merge release into master from: release/2.29.2

Author: Maffooch

README.md

@@ -55,7 +55,7 @@ cd django-DefectDojo
 
 # Run the application (for other profiles besides postgres-redis see  
 # https://github.com/DefectDojo/django-DefectDojo/blob/dev/readme-docs/DOCKER.md)
-./dc-up.sh postgres-redis
+./dc-up-d.sh postgres-redis
 
 # Obtain admin credentials. The initializer can take up to 3 minutes to run.
 # Use docker compose logs -f initializer to track its progress.

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.29.1",
+  "version": "2.29.2",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa
 
-__version__ = '2.29.1'
+__version__ = '2.29.2'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'

dojo/filters.py

@@ -148,12 +148,16 @@ def any(self, qs, name):
         return qs
 
     def satisfies_sla(self, qs, name):
-        non_sla_violations = [finding.id for finding in qs if not finding.violates_sla]
-        return Finding.objects.filter(id__in=non_sla_violations)
+        for finding in qs:
+            if finding.violates_sla:
+                qs = qs.exclude(id=finding.id)
+        return qs
 
     def violates_sla(self, qs, name):
-        sla_violations = [finding.id for finding in qs if finding.violates_sla]
-        return Finding.objects.filter(id__in=sla_violations)
+        for finding in qs:
+            if not finding.violates_sla:
+                qs = qs.exclude(id=finding.id)
+        return qs
 
     options = {
         None: (_('Any'), any),
@@ -179,12 +183,16 @@ def any(self, qs, name):
         return qs
 
     def satisfies_sla(self, qs, name):
-        non_sla_violations = [product.id for product in qs if not product.violates_sla]
-        return Product.objects.filter(id__in=non_sla_violations)
+        for product in qs:
+            if product.violates_sla:
+                qs = qs.exclude(id=product.id)
+        return qs
 
     def violates_sla(self, qs, name):
-        sla_violations = [product.id for product in qs if product.violates_sla]
-        return Product.objects.filter(id__in=sla_violations)
+        for product in qs:
+            if not product.violates_sla:
+                qs = qs.exclude(id=product.id)
+        return qs
 
     options = {
         None: (_('Any'), any),

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.29.1"
+appVersion: "2.29.2"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.99
+version: 1.6.100
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap

readme-docs/DOCKER.md

@@ -418,9 +418,7 @@ OpenSSL version: OpenSSL 1.0.1t  3 May 2016
 
 In this case, both docker (version 17.09.0-ce) and docker-compose (1.18.0) need to be updated.
 
-**NOTE** - Docker Compose version 2.19.0 and greater includes syntax restrictions that are not compatible with our compose files.  As a temporary workaround while a more complete solution is determined, please do not update docker compose to a version greater than 2.18.1.
-
-Follow [Dockers' documentation](https://docs.docker.com/install/) for your OS to get the latest version of Docker* (see above Note). For the docker command, most OSes have a built-in update mechanism like "apt upgrade".
+Follow [Docker's documentation](https://docs.docker.com/install/) for your OS to get the latest version of Docker. For the docker command, most OSes have a built-in update mechanism like "apt upgrade".
 
 Docker Compose isn't packaged like Docker and you'll need to manually update an existing install if using Linux. For Linux, either follow the instructions in the [Docker Compose documentation](https://docs.docker.com/compose/install/) or use the shell script below. The script below will update docker-compose to the latest version automatically. You will need to make the script executable and have sudo privileges to upgrade docker-compose: