Merge pull request #3380 from DefectDojo/release/1.10.2

Release: Merge release into master from: release/1.10.2

Author: valentijnscholten

Dockerfile.django

@@ -23,7 +23,8 @@ RUN \
   rm -rf /var/lib/apt/lists && \
   true
 COPY requirements.txt ./
-RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
+RUN pip3 install --no-cache-dir --upgrade pip
+RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt --use-deprecated=legacy-resolver
 
 FROM python:3.6.12-slim-buster@sha256:e5259113df5a7c4dae16ad37c2ca53b1cf722e051cfd5f624e7b76aa72389e0c
 WORKDIR /app
@@ -59,7 +60,8 @@ RUN pip3 install \
 	--no-cache-dir \
 	--no-index \
   --find-links=/tmp/wheels \
-  -r ./requirements.txt
+  -r ./requirements.txt \
+  --use-deprecated=legacy-resolver
 COPY \
   docker/entrypoint-celery-beat.sh \
   docker/entrypoint-celery-worker.sh \

Dockerfile.nginx

@@ -20,7 +20,8 @@ RUN \
   rm -rf /var/lib/apt/lists && \
   true
 COPY requirements.txt ./
-RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt
+RUN pip3 install --no-cache-dir --upgrade pip
+RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt --use-deprecated=legacy-resolver
 
 FROM build AS collectstatic
 
@@ -46,11 +47,13 @@ RUN \
   rm -rf /var/lib/apt/lists && \
   true
 
+RUN pip3 install --no-cache-dir --upgrade pip
 RUN pip3 install \
 	--no-cache-dir \
 	--no-index \
   --find-links=/tmp/wheels \
-	-r ./requirements.txt
+	-r ./requirements.txt \
+    --use-deprecated=legacy-resolver
 
 COPY components/ ./components/
 COPY manage.py ./

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "DefectDojo",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "dependencies": {
     "JUMFlot": "jumjum123/JUMFlot#*",
     "bootstrap": "^3.4.0",

dojo/__init__.py

@@ -6,6 +6,6 @@
 
 default_app_config = 'dojo.apps.DojoAppConfig'
 
-__version__ = '1.10.1'
+__version__ = '1.10.2'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'http://defectdojo.readthedocs.io/'

helm/defectdojo/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.10.1"
+appVersion: "1.10.2"
 description: A Helm chart for Kubernetes to installs DefectDojo
 name: defectdojo
 version: 1.4.0

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='DefectDojo',
-    version='1.10.1',
+    version='1.10.2',
     author='Greg Anderson',
     description="Tool for managing vulnerability engagements",
     install_requires=[