Merge branch '3.1' into base-configs-3.0

.github/workflows/testing.yml

@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - master
-      - 3.0
+      - 3.1
   pull_request:
     branches:
       - master
-      - 3.0
+      - 3.1
 
 jobs:
   build:

.whitesource

@@ -2,13 +2,44 @@
   "scanSettings": {
     "configMode": "AUTO",
     "configExternalURL": "",
-    "projectToken" : "",
-    "baseBranches": ["master", "2.2", "3.0"]
+    "projectToken": "",
+    "baseBranches": []
+  },
+  "scanSettingsSAST": {
+    "enableScan": false,
+    "scanPullRequests": false,
+    "incrementalScan": true,
+    "baseBranches": [],
+    "snippetSize": 10
   },
   "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure"
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff",
+    "useMendCheckNames": true
+  },
+  "checkRunSettingsSAST": {
+    "checkRunConclusionLevel": "failure",
+    "severityThreshold": "high"
   },
   "issueSettings": {
-    "minSeverityLevel": "LOW"
-  }
+    "minSeverityLevel": "LOW",
+    "issueType": "DEPENDENCY"
+  },
+  "issueSettingsSAST": {
+    "minSeverityLevel": "high",
+    "issueType": "repo"
+  },
+  "remediateSettings": {
+    "workflowRules": {
+      "enabled": true
+    }
+  },
+   "imageSettings":{
+       "imageTracing":{
+           "enableImageTracingPR": false,
+           "addRepositoryCoordinate": false,
+           "addDockerfilePath": false,
+           "addMendIdentifier": false
+       }
+   }
 }

Dockerfile

@@ -31,7 +31,7 @@ RUN add-apt-repository ppa:gns3/ppa && apt update && DEBIAN_FRONTEND=noninteract
 
 COPY . /gns3server
 
-RUN mkdir -p ~/.config/GNS3/3.0/
-RUN cp scripts/gns3_server.conf ~/.config/GNS3/3.0/
+RUN mkdir -p ~/.config/GNS3/3.1/
+RUN cp scripts/gns3_server.conf ~/.config/GNS3/3.1/
 
 RUN python3 -m pip install --break-system-packages --ignore-installed .

README.md

@@ -1,7 +1,7 @@
 # GNS3 server repository
 
 [![Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![GitHub Actions tests](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg?branch=3.0)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting+branch%3A3.0)
+[![GitHub Actions tests](https://github.com/GNS3/gns3-server/workflows/testing/badge.svg?branch=3.1)](https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting+branch%3A3.0)
 [![Latest PyPi version](https://img.shields.io/pypi/v/gns3-server.svg)](https://pypi.python.org/pypi/gns3-server)
 [![Snyk scanning](https://snyk.io/test/github/GNS3/gns3-server/badge.svg)](https://snyk.io/test/github/GNS3/gns3-server)
 
@@ -127,7 +127,7 @@ These commands will install the server with core Python dependencies:
 ```shell
 git clone https://github.com/GNS3/gns3-server
 cd gns3-server
-git checkout 3.0
+git checkout 3.1
 python3 -m venv venv-gns3server
 source venv-gns3server/bin/activate
 python3 -m pip install .