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

Commit

Permalink
Make the container scanning disabled warnings less alarming
Browse files Browse the repository at this point in the history
Users can usually still scan containers via atomic scan using
oscap-chroot instead of oscap-docker.
  • Loading branch information
Martin Preisler committed Sep 28, 2017
1 parent cc1664b commit 05535ac
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions openscap_daemon/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ def autodetect_tool_path(possible_names, possible_prefixes=None):
"\"Atomic.mount.DockerMount\" has been successfully"
" imported but it doesn't support the mnt_mkdir "
"argument. Please upgrade your Atomic installation "
"to 1.4 or higher. Container scanning functionality"
" will be disabled."
"to 1.4 or higher. Direct container scanning via "
"oscap-docker will be disabled."
)

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

except ImportError:
logging.warning("Can't import the 'Atomic.mount' package. "
"Container scanning functionality will be "
"disabled.")
"Direct container scanning via "
"oscap-docker will be disabled.")
except ImportError:
logging.warning("Can't import the 'docker' package. Container "
"scanning functionality will be disabled.")
logging.warning("Can't import the 'docker' package. Direct "
"container scanning via oscap-docker will be "
"disabled.")

def autodetect_content_paths(self):
def autodetect_content_path(possible_paths, possible_filenames):
Expand Down

0 comments on commit 05535ac

Please sign in to comment.