Merge branch 'dev' into master-into-dev/2.27.1-2.28.0-dev

DefectDojo · Oct 10, 2023 · 5ecd765 · 5ecd765
2 parents 1fec02c + d36b1e3
commit 5ecd765
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/cancel-outdated-workflow-runs.yml b/.github/workflows/cancel-outdated-workflow-runs.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
+      - uses: styfle/cancel-workflow-action@0.12.0
         with:
           workflow_id: 'integration-tests.yml,k8s-testing.yml,unit-tests.yml'
           access_token: ${{ github.token }}
diff --git a/Dockerfile.nginx-alpine b/Dockerfile.nginx-alpine
@@ -140,7 +140,7 @@ COPY manage.py ./
 COPY dojo/ ./dojo/
 RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
 
-FROM nginx:1.25.2-alpine@sha256:16164a43b5faec40adb521e98272edc528e74f31c1352719132b8f7e53418d70
+FROM nginx:1.25.2-alpine@sha256:4c93a3bd8bf95412889dd84213570102176b6052d88bb828eaf449c56aca55ef
 ARG uid=1001
 ARG appuser=defectdojo
 COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

diff --git a/Dockerfile.nginx-debian b/Dockerfile.nginx-debian
@@ -75,7 +75,7 @@ COPY dojo/ ./dojo/
 
 RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
 
-FROM nginx:1.25.2-alpine@sha256:16164a43b5faec40adb521e98272edc528e74f31c1352719132b8f7e53418d70
+FROM nginx:1.25.2-alpine@sha256:4c93a3bd8bf95412889dd84213570102176b6052d88bb828eaf449c56aca55ef
 ARG uid=1001
 ARG appuser=defectdojo
 COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -156,7 +156,7 @@ services:
     volumes:
        - defectdojo_rabbitmq:/var/lib/rabbitmq
   redis:
-    image: redis:7.2.1-alpine@sha256:9150d86fe2a9d03bbdb15bb9758fa5e3d24632386af8f6eb4d675ee4c976f499
+    image: redis:7.2.1-alpine@sha256:343e6546f35877801de0b8580274a5e3a8e8464cabe545a2dd9f3c78df77542a
     profiles: 
       - mysql-redis
       - postgres-redis

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ asteval==0.9.31
 bleach==6.0.0
 bleach[css]
 celery==5.3.4
-coverage==7.3.1
+coverage==7.3.2
 defusedxml==0.7.1
 django_celery_results==2.5.1
 django-auditlog==2.3.0
@@ -37,7 +37,7 @@ mysqlclient==2.1.1
 openpyxl==3.1.2
 xlrd==1.2.0
 Pillow==10.0.1  # required by django-imagekit
-psycopg2-binary==2.9.8
+psycopg2-binary==2.9.9
 cryptography==41.0.4
 python-dateutil==2.8.2
 pytz==2023.3.post1
@@ -78,7 +78,7 @@ django-ratelimit==4.1.0
 argon2-cffi==23.1.0
 blackduck==1.1.0
 pycurl==7.45.2  # Required for Celery Broker AWS (SQS) support
-boto3==1.28.57  # Required for Celery Broker AWS (SQS) support
+boto3==1.28.59  # Required for Celery Broker AWS (SQS) support
 netaddr==0.8.0
 vulners==2.1.0
 fontawesomefree==6.4.2