Merge branch 'main' into renovate/element-hq-synapse-1.x

.github/workflows/integration_test.yaml

@@ -14,5 +14,3 @@ jobs:
       juju-channel: 3.4/stable
       channel: 1.28-strict/stable
       modules: '["test_charm", "test_nginx", "test_s3", "test_scaling"]'
-      self-hosted-runner: false
-      self-hosted-runner-label: "edge"

.trivyignore

@@ -0,0 +1,47 @@
+# Vulnerabilites related to: Pebble, Node.JS and gosu
+CVE-2021-39293
+CVE-2021-41771
+CVE-2021-41772
+CVE-2021-44716
+CVE-2022-23772
+CVE-2022-23806
+CVE-2022-24675
+CVE-2022-24921
+CVE-2022-25883
+CVE-2022-27664
+CVE-2022-28131
+CVE-2022-28327
+CVE-2022-2879
+CVE-2022-2880
+CVE-2022-29804
+CVE-2022-30580
+CVE-2022-30630
+CVE-2022-30631
+CVE-2022-30632
+CVE-2022-30633
+CVE-2022-30634
+CVE-2022-30635
+CVE-2022-32189
+CVE-2022-41715
+CVE-2022-41716
+CVE-2022-41720
+CVE-2022-41722
+CVE-2022-41723
+CVE-2022-41724
+CVE-2022-41725
+CVE-2022-46175
+CVE-2023-24534
+CVE-2023-24536
+CVE-2023-24537
+CVE-2023-24538
+CVE-2023-24539
+CVE-2023-24540
+CVE-2023-29400
+CVE-2023-29403
+CVE-2023-39325
+CVE-2023-45283
+CVE-2023-45287
+CVE-2023-45288
+CVE-2024-24790
+CVE-2024-29415
+CVE-2024-34156

requirements.txt

@@ -1,4 +1,4 @@
-boto3 ==1.35.48
+boto3 ==1.35.49
 cosl ==0.0.42
 deepdiff ==8.0.1
 jinja2 ==3.1.4

trivy.yaml

@@ -1,3 +1,5 @@
 timeout: 20m
 scan:
   offline-scan: true
+db:
+  repository: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db