diff --git a/Makefile b/Makefile index 4ffc82b9..bef52cd7 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ test-min-with-upgrade: venv-min-upgrade ## Upgrade deps and run unit tests in mi ./venv-min/bin/python ./unitest.py # =================================================================== -# Linters and profilers +# Linters, profilers and cyber security # =================================================================== format: ## Format the code @@ -123,6 +123,10 @@ memory-profiling: ## Profile memory usage ./venv-dev/bin/mprof plot --output ./docs/_static/glances-memory-profiling-without-history.png rm -f mprofile_*.dat +# Trivy installation: https://aquasecurity.github.io/trivy/latest/getting-started/installation/ +trivy: ## Run Trivy to find vulnerabilities in container images + trivy fs . + # =================================================================== # Docs # =================================================================== diff --git a/docker-requirements.txt b/docker-requirements.txt index 0792572a..c93beffe 100644 --- a/docker-requirements.txt +++ b/docker-requirements.txt @@ -6,5 +6,5 @@ podman; python_version >= "3.6" packaging; python_version >= "3.7" python-dateutil six -urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392 -requests # See issue - https://github.com/nicolargo/glances/issues/2233 +urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2617 +requests