Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 05535ac

Browse files
author
Martin Preisler
committed
Make the container scanning disabled warnings less alarming
Users can usually still scan containers via atomic scan using oscap-chroot instead of oscap-docker.
1 parent cc1664b commit 05535ac

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

openscap_daemon/config.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def autodetect_tool_path(possible_names, possible_prefixes=None):
124124
"\"Atomic.mount.DockerMount\" has been successfully"
125125
" imported but it doesn't support the mnt_mkdir "
126126
"argument. Please upgrade your Atomic installation "
127-
"to 1.4 or higher. Container scanning functionality"
128-
" will be disabled."
127+
"to 1.4 or higher. Direct container scanning via "
128+
"oscap-docker will be disabled."
129129
)
130130

131131
logging.info("Successfully imported 'docker' and "
@@ -134,11 +134,12 @@ def autodetect_tool_path(possible_names, possible_prefixes=None):
134134

135135
except ImportError:
136136
logging.warning("Can't import the 'Atomic.mount' package. "
137-
"Container scanning functionality will be "
138-
"disabled.")
137+
"Direct container scanning via "
138+
"oscap-docker will be disabled.")
139139
except ImportError:
140-
logging.warning("Can't import the 'docker' package. Container "
141-
"scanning functionality will be disabled.")
140+
logging.warning("Can't import the 'docker' package. Direct "
141+
"container scanning via oscap-docker will be "
142+
"disabled.")
142143

143144
def autodetect_content_paths(self):
144145
def autodetect_content_path(possible_paths, possible_filenames):

0 commit comments

Comments
 (0)