Merge branch 'IBM:master' into diff-branch

Makefile.ibm

@@ -64,7 +64,7 @@ trivy-scan-python-vulnerabilities:
 	./scripts/gen-pipfile.sh > Pipfile
 	pipenv --python `which python3`
 	pipenv lock
-	$(TRIVY) fs --exit-code 1 --ignore-unfixed --security-checks vuln ./
+	$(TRIVY) fs --exit-code 1 --ignore-unfixed --scanners vuln ./
 
 docker-quality-images:
 	for image_name in $(DOCKER_IMAGES_TO_SCAN) ; do												\

docs/developer-tool-faq.md

@@ -419,11 +419,11 @@ The `detect-secrets` tool can also be run as a docker container. It supports Win
 
 #### Prerequisite
 
-You need to have Python and [install the pre-commit framework](https://pre-commit.com/#install). The docker image of `detect-secrets` saves you the effort of installing the detect-secret pip package, which would require a heavy weight compilation environment. Besides that, please also make sure you have [docker installed](https://docs.docker.com/install/).
+You need to have Python and [install the pre-commit framework](https://pre-commit.com/#install). The docker image of `detect-secrets` saves you the effort of installing the detect-secret pip package, which would require a heavy weight compilation environment. Besides that, please also make sure you have a desktop container management application such as [Rancher Desktop](https://rancherdesktop.io) or [Podman Desktop](https://podman-desktop.io) installed. (NOTE: Docker Desktop is no longer approved to use on IBM devices.)
 
 1. python [installed](https://docs.python-guide.org/starting/installation/)
 1. pre-commit framework [installed](https://pre-commit.com/#install)
-1. docker [installed](https://docs.docker.com/install/)
+1. [Rancher Desktop](https://rancherdesktop.io) or [Podman Desktop](https://podman-desktop.io) installed
 
 #### Setup steps
 

trivy-secret.yaml

@@ -0,0 +1,2 @@
+disable-rules:
+  - jwt-token