diff options
author | mboelen <michael@cisofy.com> | 2016-04-28 10:15:54 +0300 |
---|---|---|
committer | mboelen <michael@cisofy.com> | 2016-04-28 10:15:54 +0300 |
commit | 9e312f5a5f2a1379a29151d8cb87cd22f387bc6c (patch) | |
tree | e33f24994327564c621802c4c2052f3685adbb8f /include/helper_audit_dockerfile | |
parent | 5e587adf8a630383a207adfcc658c1fe6401977f (diff) |
Replaced functions and minor cleanups
Diffstat (limited to 'include/helper_audit_dockerfile')
-rw-r--r-- | include/helper_audit_dockerfile | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/include/helper_audit_dockerfile b/include/helper_audit_dockerfile index eb6f24c0..cabb9e92 100644 --- a/include/helper_audit_dockerfile +++ b/include/helper_audit_dockerfile @@ -71,16 +71,16 @@ fi case ${IMAGE} in "debian") - logtext "Image = Debian based" + LogText "Image = Debian based" PKGMGR="apt" ;; "fedora*") - logtext " Image = Fedora based" + LogText " Image = Fedora based" PKGMGR="yum" ;; "ubuntu") - logtext " Image = Ubuntu based" + LogText " Image = Ubuntu based" PKGMGR="apt" ;; *) @@ -113,20 +113,20 @@ InsertSection "Basics" "apt") FIND=`egrep "apt-get(.*) install" ${AUDIT_FILE}` if [ ! "${FIND}" = "" ]; then - logtext "Found installation via apt-get" + LogText "Found installation via apt-get" else - logtext "No installations found via apt-get" + LogText "No installations found via apt-get" fi ;; *) - logtext "Unknown package manager" + LogText "Unknown package manager" ;; esac FIND=`egrep " (gcc|libc6-dev|make)" ${AUDIT_FILE} | grep -v "^#"` if [ ! "${FIND}" = "" ]; then ReportWarning "dockerfile" "L" "Possible development utilities found, which is not advised for production environment" - logtext "Details: ${FIND}" + LogText "Details: ${FIND}" fi # SSH @@ -142,14 +142,14 @@ InsertSection "Basics" FILE_DOWNLOAD=0 - logtext "Checking usage of cURL" + LogText "Checking usage of cURL" FIND_CURL=`grep curl ${AUDIT_FILE}` if [ ! "${FIND_CURL}" = "" ]; then Display --indent 4 --text "Download tool" --result "curl" FILE_DOWNLOAD=1 fi - logtext "Checking usage of wget" + LogText "Checking usage of wget" FIND_WGET=`grep wget ${AUDIT_FILE}` if [ ! "${FIND_WGET}" = "" ]; then Display --indent 4 --text "Download tool" --result "wget" @@ -161,7 +161,7 @@ InsertSection "Basics" if [ ! "${FIND}" = "" ]; then FILE_DOWNLOAD=1 ReportWarning "dockerfile" "L" "Found download of file via ADD. Unclear if the integrity of this file is checked, or file is signed" - logtext "Details: ${FIND}" + LogText "Details: ${FIND}" fi if [ ${FILE_DOWNLOAD} -eq 1 ]; then @@ -199,12 +199,11 @@ InsertSection "Basics" ################################################################################################## # - -# Removing temp file -logtext "Action: Removing temporary file ${TMP_FILE}" - if [ -f ${TMP_FILE} ]; then - rm -f ${TMP_FILE} - fi + # Removing temp file + LogText "Action: Removing temporary file ${TMP_FILE}" + if [ -f ${TMP_FILE} ]; then + rm -f ${TMP_FILE} + fi # The End |