Merge pull request DefectDojo#3381 from DefectDojo/master-into-dev/1.11.0-dev/2020-11-30T17h55m34s

valentijnscholten · web-flow · commit 0f24e1655875 · 2020-11-30T18:56:19.000+01:00
Release: Merge back master into dev from: master-into-dev/1.11.0-dev/2020-11-30T17h55m34s
diff --git a/.github/workflows/new-release-master-into-dev.yml b/.github/workflows/new-release-master-into-dev.yml
@@ -27,7 +27,7 @@ jobs:
           ref: master
       - name: Create merge back branch
         run: |
-          echo "NEW_BRANCH=master-into-dev/${{ github.event.inputs.release_number_dev }}" >> $GITHUB_ENV
+          echo "NEW_BRANCH=master-into-dev/${{ github.event.inputs.release_number_dev }}/$(date +'%Y-%m-%dT%Hh%Mm%Ss')" >> $GITHUB_ENV
       - name: Configure git
         run: |
           git config --global user.name "${{ env.GIT_USERNAME }}"
diff --git a/Dockerfile.django b/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 \
diff --git a/Dockerfile.nginx b/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 ./
