diff options
| -rwxr-xr-x | tools/validate-all-dockerfiles.sh | 2 | ||||
| -rwxr-xr-x | tools/validate-binary-build.sh | 48 |
2 files changed, 0 insertions, 50 deletions
diff --git a/tools/validate-all-dockerfiles.sh b/tools/validate-all-dockerfiles.sh index f840c1a8a..893875ee6 100755 --- a/tools/validate-all-dockerfiles.sh +++ b/tools/validate-all-dockerfiles.sh @@ -15,6 +15,4 @@ find docker -name Dockerfile.j2 -print0 | find docker -name Dockerfile.j2 -print0 | xargs -0 tools/validate-indentation.sh || RES=1 -tools/validate-binary-build.sh || RES=1 - exit $RES diff --git a/tools/validate-binary-build.sh b/tools/validate-binary-build.sh deleted file mode 100755 index b0d5c0014..000000000 --- a/tools/validate-binary-build.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# Move to top level directory -REAL_PATH=$(realpath $0) -cd "$(dirname "$REAL_PATH")/.." - -RES=0 - -generate_templates () { - echo Generating templates for $distro - tools/build.py --template-only --type binary --base $distro --work-dir=$tmpdir -} - -check_for_errors () { - regex=$1 - # Look for all rendered Dockerfile. - # TODO(mwhahaha): Skip kolla-toolbox for now as it's dependent on specific - # set of pip installed items. - find $tmpdir/docker -not -path "*kolla-toolbox*" -name Dockerfile -print0 | - xargs -0 egrep --color "$regex" - # NOTE(mandre) grep returns status code of 1 if the expression isn't found - # xargs returns with status 123 when the command invocation returns with an - # exit status 1-125, this is what we should be looking for as our "everything - # is good" code. - if [ $? -ne 123 ]; then - RES=1 - fi -} - -echo Looking for forbidden instructions in binary image templates - -for distro in debian ubuntu centos; do - tmpdir=$(mktemp -d kolla-templates.XXXXXX --tmpdir) - generate_templates - check_for_errors "gem .*install" - check_for_errors "pip .*install" - check_for_errors "npm .*install" - check_for_errors "git .*clone" - check_for_errors "wget" - check_for_errors "curl" - rm -r $tmpdir -done - -if [ $RES -eq 1 ]; then - echo "ERROR Found forbidden instructions in binary image templates" -fi -# Let's not make it fail pep8 job for now -#exit $RES |