Skip to content

Commit 58f54db

Browse files
Merge pull request #141 from IBM/update_docs_to_replace_docker_references
Update docs to remove references to docker desktop
2 parents d7c7992 + f3d2a05 commit 58f54db

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile.ibm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ trivy-scan-python-vulnerabilities:
6464
./scripts/gen-pipfile.sh > Pipfile
6565
pipenv --python `which python3`
6666
pipenv lock
67-
$(TRIVY) fs --exit-code 1 --ignore-unfixed --security-checks vuln ./
67+
$(TRIVY) fs --exit-code 1 --ignore-unfixed --scanners vuln ./
6868

6969
docker-quality-images:
7070
for image_name in $(DOCKER_IMAGES_TO_SCAN) ; do \

docs/developer-tool-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,11 @@ The `detect-secrets` tool can also be run as a docker container. It supports Win
419419

420420
#### Prerequisite
421421

422-
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/).
422+
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.)
423423

424424
1. python [installed](https://docs.python-guide.org/starting/installation/)
425425
1. pre-commit framework [installed](https://pre-commit.com/#install)
426-
1. docker [installed](https://docs.docker.com/install/)
426+
1. [Rancher Desktop](https://rancherdesktop.io) or [Podman Desktop](https://podman-desktop.io) installed
427427

428428
#### Setup steps
429429

trivy-secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
disable-rules:
2+
- jwt-token

0 commit comments

Comments
 (0)