Skip to content

[Ubuntu] Fix issue with docker.service and docker.socket files not found #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2020
Merged

[Ubuntu] Fix issue with docker.service and docker.socket files not found #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d42fedc
fix(sh): check default ubuntu locations of docker.service and docker.…
illyaMs Apr 10, 2020
51bc75e
fix(docs): explain the need of mounting `/lib/systemd/system` folder …
illyaMs Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ docker run -it --net host --pid host --userns host --cap-add audit_control \
docker/docker-bench-security
```

Don't forget to adjust the shared volumes according to your operating system,
for example `Docker Desktop` on macOS don't have `/usr/lib/systemd` or the above
Docker binaries.
Don't forget to adjust the shared volumes according to your operating system. Some examples are:
1. `Docker Desktop` on macOS don't have `/usr/lib/systemd` or the above Docker binaries.

```sh
docker run -it --net host --pid host --userns host --cap-add audit_control \
Expand All @@ -48,6 +47,22 @@ docker run -it --net host --pid host --userns host --cap-add audit_control \
docker/docker-bench-security
```

2. On Ubuntu the `docker.service` and `docker.secret` files are located in `/lib/systemd/system` folder by default.

```sh
docker run -it --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/docker-containerd:/usr/bin/docker-containerd:ro \
-v /usr/bin/docker-runc:/usr/bin/docker-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
```

Docker bench requires Docker 1.13.0 or later in order to run.

Note that when distributions doesn't contain `auditctl`, the audit tests will
Expand Down
4 changes: 3 additions & 1 deletion helper_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ get_docker_configuration_file_args() {
grep "$OPTION" "$CONFIG_FILE" | sed 's/.*://g' | tr -d '" ',
}

get_systemd_service_file() {
get_service_file() {
SERVICE="$1"

if [ -f "/etc/systemd/system/$SERVICE" ]; then
echo "/etc/systemd/system/$SERVICE"
elif [ -f "/lib/systemd/system/$SERVICE" ]; then
echo "/lib/systemd/system/$SERVICE"
elif systemctl show -p FragmentPath "$SERVICE" 2> /dev/null 1>&2; then
systemctl show -p FragmentPath "$SERVICE" | sed 's/.*=//'
else
Expand Down
4 changes: 2 additions & 2 deletions tests/1_host_configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ check_1_2_6() {
starttestjson "$id_1_2_6" "$desc_1_2_6"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.service)"
file="$(get_service_file docker.service)"
if [ -f "$file" ]; then
if command -v auditctl >/dev/null 2>&1; then
if auditctl -l | grep "$file" >/dev/null 2>&1; then
Expand Down Expand Up @@ -251,7 +251,7 @@ check_1_2_7() {
starttestjson "$id_1_2_7" "$desc_1_2_7"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.socket)"
file="$(get_service_file docker.socket)"
if [ -e "$file" ]; then
if command -v auditctl >/dev/null 2>&1; then
if auditctl -l | grep "$file" >/dev/null 2>&1; then
Expand Down
8 changes: 4 additions & 4 deletions tests/3_docker_daemon_configuration_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ check_3_1() {
starttestjson "$id_3_1" "$desc_3_1"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.service)"
file="$(get_service_file docker.service)"
if [ -f "$file" ]; then
if [ "$(stat -c %u%g $file)" -eq 00 ]; then
pass "$check_3_1"
Expand Down Expand Up @@ -45,7 +45,7 @@ check_3_2() {
starttestjson "$id_3_2" "$desc_3_2"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.service)"
file="$(get_service_file docker.service)"
if [ -f "$file" ]; then
if [ "$(stat -c %a $file)" -eq 644 ] || [ "$(stat -c %a $file)" -eq 600 ]; then
pass "$check_3_2"
Expand Down Expand Up @@ -73,7 +73,7 @@ check_3_3() {
starttestjson "$id_3_3" "$desc_3_3"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.socket)"
file="$(get_service_file docker.socket)"
if [ -f "$file" ]; then
if [ "$(stat -c %u%g $file)" -eq 00 ]; then
pass "$check_3_3"
Expand Down Expand Up @@ -101,7 +101,7 @@ check_3_4() {
starttestjson "$id_3_4" "$desc_3_4"

totalChecks=$((totalChecks + 1))
file="$(get_systemd_service_file docker.socket)"
file="$(get_service_file docker.socket)"
if [ -f "$file" ]; then
if [ "$(stat -c %a $file)" -eq 644 ] || [ "$(stat -c %a $file)" -eq 600 ]; then
pass "$check_3_4"
Expand Down