GuillaumeHemmen/docker-bench-security
1
0
Fork 0
mirror of https://github.com/docker/docker-bench-security.git synced 2025-01-18 16:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #525 from brsolomon-deloitte/bugfix/get_docker_configuration_file_args

Browse source 
fix: allow get_docker_configuration_file_args to parse minified json
This commit is contained in:
Thomas Sjögren 2023-06-02 21:46:09 +00:00 committed by GitHub
commit 1d29a1f405
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -7,7 +7,8 @@ LABEL \
RUN apk add --no-cache iproute2 \ RUN apk add --no-cache iproute2 \
docker-cli \ docker-cli \
dumb-init dumb-init \
jq
COPY . /usr/local/bin/ COPY . /usr/local/bin/

2
README.md
View file

@ -26,6 +26,8 @@ cd docker-bench-security
sudo sh docker-bench-security.sh sudo sh docker-bench-security.sh
``` ```
> Note: [`jq`](https://jqlang.github.io/jq/) is an optional but recommended dependency.
### Run with Docker ### Run with Docker
_Please note that the `docker/docker-bench-security` image is out-of-date and and a manual build is required. See [#405](https://github.com/docker/docker-bench-security/issues/405) for more information._ _Please note that the `docker/docker-bench-security` image is out-of-date and and a manual build is required. See [#405](https://github.com/docker/docker-bench-security/issues/405) for more information._

11
functions/helper_lib.sh
View file

@ -11,6 +11,11 @@ req_programs() {
for p in $1; do for p in $1; do
command -v "$p" >/dev/null 2>&1 || { printf "Required program not found: %s\n" "$p"; exit 1; } command -v "$p" >/dev/null 2>&1 || { printf "Required program not found: %s\n" "$p"; exit 1; }
done done
if command -v jq >/dev/null 2>&1; then
HAVE_JQ=true
else
HAVE_JQ=false
fi
if command -v ss >/dev/null 2>&1; then if command -v ss >/dev/null 2>&1; then
netbin=ss netbin=ss
return return
@ -117,7 +122,11 @@ get_docker_configuration_file_args() {
get_docker_configuration_file get_docker_configuration_file
grep "$OPTION" "$CONFIG_FILE" | sed 's/.*://g' | tr -d '" ', if "$HAVE_JQ"; then
jq --monochrome-output --raw-output ".[\"${OPTION}\"]" "$CONFIG_FILE"
else
cat "$CONFIG_FILE" | tr { '\n' | tr , '\n' | tr } '\n' | grep "$OPTION" | sed 's/.*://g' | tr -d '" ',
fi
} }
get_service_file() { get_service_file() {