Small improvement of user experience

.dockerignore

@@ -1,5 +1,6 @@
-.git
-*.md
-*.png
-distros
-
+*
+!docker-bench-security.sh
+!functions/
+!tests/
+!log/
+log/*

.gitignore

@@ -1 +1,2 @@
-*.log*
+log/*
+*.swp*

Dockerfile

@@ -5,17 +5,11 @@ LABEL \
   org.label-schema.url="https://dockerbench.com" \
   org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
-# Switch to the HTTPS endpoint for the apk repositories
-# https://github.com/gliderlabs/docker-alpine/issues/184
-RUN set -eux; \
-  sed -i 's!http://dl-cdn.alpinelinux.org/!https://alpine.global.ssl.fastly.net/!g' /etc/apk/repositories && \
-  apk add --no-cache \
-    iproute2 \
-    docker-cli \
-    dumb-init
+RUN apk add --no-cache iproute2 \
+                       docker-cli \
+                       dumb-init
 
-COPY ./*.sh /usr/local/bin/
-COPY ./tests/*.sh /usr/local/bin/tests/
+COPY . /usr/local/bin/
 
 HEALTHCHECK CMD exit 0
 

README.md

@@ -1,24 +1,30 @@
 # Docker Bench for Security
 
-![Docker Bench for Security running](https://raw.githubusercontent.com/docker/docker-bench-security/master/benchmark_log.png)
+![Docker Bench for Security running](img/benchmark_log.png)
 
-The Docker Bench for Security is a script that checks for dozens of common
-best-practices around deploying Docker containers in production. The tests are
-all automated, and are inspired by the [CIS Docker Benchmark v1.2.0](https://www.cisecurity.org/benchmark/docker/).
+The Docker Bench for Security is a script that checks for dozens of common best-practices around deploying Docker containers in production. The tests are all automated, and are inspired by the [CIS Docker Benchmark v1.2.0](https://www.cisecurity.org/benchmark/docker/).
 
-We are making this available as an open-source utility so the Docker community
-can have an easy way to self-assess their hosts and docker containers against
-this benchmark.
+The list with all tests is available [here](tests/TESTS.md).
+
+We are making this available as an open-source utility so the Docker community can have an easy way to self-assess their hosts and docker containers against this benchmark.
 
 ## Running Docker Bench for Security
 
-We packaged docker bench as a small container for your convenience. Note that
-this container is being run with a *lot* of privilege -- sharing the host's
-filesystem, pid and network namespaces, due to portions of the benchmark
-applying to the running host.
+### Run from your base host
+
+You can simply run this script from your base host by running:
+
+```sh
+git clone https://github.com/docker/docker-bench-security.git
+cd docker-bench-security
+sudo sh docker-bench-security.sh
+```
+
+### Run with Docker
+
+We packaged docker bench as a small container for your convenience. Note that this container is being run with a *lot* of privilege -- sharing the host's filesystem, pid and network namespaces, due to portions of the benchmark applying to the running host.
 
-The easiest way to run your hosts against the Docker Bench for Security is by
-running our pre-built container:
+The easiest way to run your hosts against the Docker Bench for Security is by running our pre-built container:
 
 ```sh
 docker run --rm --net host --pid host --userns host --cap-add audit_control \
@@ -36,118 +42,97 @@ docker run --rm --net host --pid host --userns host --cap-add audit_control \
 Don't forget to adjust the shared volumes according to your operating system.
 Some examples are:
 
-1. `Docker Desktop` on macOS doesn't have `/usr/lib/systemd` or the above Docker
-    binaries.
+1. On Ubuntu the `docker.service` and `docker.secret` files are located in
+   `/lib/systemd/system` folder by default.
 
 ```sh
 docker run --rm --net host --pid host --userns host --cap-add audit_control \
     -e DOCKER_CONTENT_TRUST=$DOCKER_CONTENT_TRUST \
-    -v /etc:/etc \
+    -v /etc:/etc:ro \
+    -v /lib/systemd/system:/lib/systemd/system:ro \
+    -v /usr/bin/containerd:/usr/bin/containerd:ro \
+    -v /usr/bin/runc:/usr/bin/runc:ro \
+    -v /usr/lib/systemd:/usr/lib/systemd:ro \
     -v /var/lib:/var/lib:ro \
     -v /var/run/docker.sock:/var/run/docker.sock:ro \
     --label docker_bench_security \
     docker/docker-bench-security
 ```
 
-2. On Ubuntu the `docker.service` and `docker.secret` files are located in
-   `/lib/systemd/system` folder by default.
+2. `Docker Desktop` on macOS doesn't have `/usr/lib/systemd` or the above Docker
+    binaries.
 
 ```sh
 docker run --rm --net host --pid host --userns host --cap-add audit_control \
     -e DOCKER_CONTENT_TRUST=$DOCKER_CONTENT_TRUST \
-    -v /etc:/etc:ro \
-    -v /lib/systemd/system:/lib/systemd/system:ro \
-    -v /usr/bin/containerd:/usr/bin/containerd:ro \
-    -v /usr/bin/runc:/usr/bin/runc:ro \
-    -v /usr/lib/systemd:/usr/lib/systemd:ro \
+    -v /etc:/etc \
     -v /var/lib:/var/lib:ro \
     -v /var/run/docker.sock:/var/run/docker.sock:ro \
     --label docker_bench_security \
     docker/docker-bench-security
 ```
 
-Docker bench requires Docker 1.13.0 or later in order to run.
+### Note
 
-Note that when distributions don't contain `auditctl`, the audit tests will
-check `/etc/audit/audit.rules` to see if a rule is present instead.
-
-Distribution specific Dockerfiles that fix these issues are available in the
-[distros directory](https://github.com/docker/docker-bench-security/tree/master/distros).
+Docker bench requires Docker 1.13.0 or later in order to run.
 
-The [distribution specific Dockerfiles](https://github.com/docker/docker-bench-security/tree/master/distros)
-may also help if the distribution you're using hasn't yet shipped Docker
-version 1.13.0 or later.
+Note that when distributions don't contain `auditctl`, the audit tests will check `/etc/audit/audit.rules` to see if a rule is present instead.
 
 ### Docker Bench for Security options
 
 ```sh
   -b           optional  Do not print colors
   -h           optional  Print this help message
   -l FILE      optional  Log output in FILE, inside container if run using docker
-  -c CHECK     optional  Comma delimited list of specific check(s)
-  -e CHECK     optional  Comma delimited list of specific check(s) to exclude
+  -u USERS     optional  Comma delimited list of trusted docker user(s)
+  -c CHECK     optional  Comma delimited list of specific check(s) id
+  -e CHECK     optional  Comma delimited list of specific check(s) id to exclude
   -i INCLUDE   optional  Comma delimited list of patterns within a container or image name to check
   -x EXCLUDE   optional  Comma delimited list of patterns within a container or image name to exclude from check
+  -n LIMIT     optional  In JSON output, when reporting lists of items (containers, images, etc.), limit the number of reported items to LIMIT. Default 0 (no limit).
+  -p PRINT     optional  Disable the printing of remediation measures. Default: print remediation measures.
 ```
 
-By default the Docker Bench for Security script will run all available CIS tests
-and produce logs in the current directory, named `docker-bench-security.sh.log.json`
-and `docker-bench-security.sh.log`.
+By default the Docker Bench for Security script will run all available CIS tests and produce 
+logs in the log folder from current directory, named `docker-bench-security.sh.log.json` and 
+`docker-bench-security.sh.log`.
 
-If the docker container is used then the log files will be created inside the container. If you wish to access them from the host after the container has been run you will need to mount a volume for storing them in.
+If the docker container is used then the log files will be created inside the container in location `/usr/local/bin/log/`. If you wish to access them from the host after the container has been run you will need to mount a volume for storing them in.
 
-The CIS based checks are named `check_<section>_<number>`, e.g. `check_2_6`
-and community contributed checks are named `check_c_<number>`.
-A complete list of checks is present in [functions_lib.sh](functions_lib.sh).
+The CIS based checks are named `check_<section>_<number>`, e.g. `check_2_6` and community contributed checks are named `check_c_<number>`. A complete list of checks is present in [TESTS.md](tests/TESTS.md).
 
-`sh docker-bench-security.sh -l /tmp/docker-bench-security.sh.log -c check_2_2`
-will only run check `2.2 Ensure the logging level is set to 'info'`.
+`sh docker-bench-security.sh -c check_2_2` will only run check `2.2 Ensure the logging level is set to 'info'`.
 
-`sh docker-bench-security.sh -l /tmp/docker-bench-security.sh.log -e check_2_2`
-will run all available checks except `2.2 Ensure the logging level is set to 'info'`.
+`sh docker-bench-security.sh -e check_2_2` will run all available checks except `2.2 Ensure the logging level is set to 'info'`.
 
-`sh docker-bench-security.sh -l /tmp/docker-bench-security.sh.log -e docker_enterprise_configuration`
-will run all available checks except the docker_enterprise_configuration group
+`sh docker-bench-security.sh -e docker_enterprise_configuration` will run all available checks except the docker_enterprise_configuration group
 
-`sh docker-bench-security.sh -l /tmp/docker-bench-security.sh.log -e docker_enterprise_configuration,check_2_2`
-will run all available checks except the docker_enterprise_configuration group
-and `2.2 Ensure the logging level is set to 'info'`
+`sh docker-bench-security.sh -e docker_enterprise_configuration,check_2_2` will run allavailable checks except the docker_enterprise_configuration group and `2.2 Ensure the logging level is set to 'info'`
 
-`sh docker-bench-security.sh -l /tmp/docker-bench-security.sh.log -c container_images -e check_4_5`
-will run just the container_images checks except
-`4.5 Ensure Content trust for Docker is Enabled`
+`sh docker-bench-security.sh -c container_images -e check_4_5` will run just the container_images checks except `4.5 Ensure Content trust for Docker is Enabled`
 
-Note that when submitting checks, provide information why it is a
-reasonable test to add and please include some kind of official documentation
-verifying that information.
+Note that when submitting checks, provide information why it is a reasonable test to add and please include some kind of official documentation verifying that information.
 
-## Building Docker Bench for Security
+## Building Docker image
 
-If you wish to build and run this container yourself, you can follow the
-following steps:
+You have two options if you wish to build and run this container yourself:
+
+1. Use Docker Build:
 
 ```sh
 git clone https://github.com/docker/docker-bench-security.git
 cd docker-bench-security
 docker build --no-cache -t docker-bench-security .
 ```
 
-followed by an appropriate `docker run` command as stated above
-or use [Docker Compose](https://docs.docker.com/compose/):
+Followed by an appropriate `docker run` command as stated above.
 
-```sh
-git clone https://github.com/docker/docker-bench-security.git
-cd docker-bench-security
-docker-compose run --rm docker-bench-security
-```
-
-Also, this script can also be simply run from your base host by running:
+2. Use Docker Compose:
 
 ```sh
 git clone https://github.com/docker/docker-bench-security.git
 cd docker-bench-security
-sudo sh docker-bench-security.sh
+docker-compose run --rm docker-bench-security
 ```
 
-This script was built to be POSIX 2004 compliant, so it should be portable
-across any Unix platform.
+This script was built to be POSIX 2004 compliant, so it should be portable across any Unix platform.

distros/Dockerfile.alpine

@@ -1,21 +1,15 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 LABEL \
   org.label-schema.name="docker-bench-security" \
   org.label-schema.url="https://dockerbench.com" \
   org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
-# Switch to the HTTPS endpoint for the apk repositories
-# https://github.com/gliderlabs/docker-alpine/issues/184
-RUN set -eux; \
-  sed -i 's!http://dl-cdn.alpinelinux.org/!https://alpine.global.ssl.fastly.net/!g' /etc/apk/repositories && \
-  apk add --no-cache \
-    iproute2 \
-    docker-cli \
-    dumb-init
+RUN apk add --no-cache iproute2 \
+                       docker-cli \
+                       dumb-init
 
-COPY ./*.sh /usr/local/bin/
-COPY ./tests/*.sh /usr/local/bin/tests/
+COPY . /usr/local/bin/
 
 HEALTHCHECK CMD exit 0