summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJon Schlueter <jschluet@redhat.com>2018-07-26 14:50:39 -0400
committerJon Schlueter <jschluet@redhat.com>2018-07-26 14:51:41 -0400
commit2b023ba13ef0f11757fef029a4a6ed5a2468700e (patch)
treed59d9c5f94c413c067b7c06718cf326f1da19fb7 /tools
parent778f6dc8235d251d851044b3c54c3d7aded750f5 (diff)
downloadkolla-2b023ba13ef0f11757fef029a4a6ed5a2468700e.tar.gz
kolla-2b023ba13ef0f11757fef029a4a6ed5a2468700e.zip
validate-indentation: expand check to also catch macros.install_packages
Fixed up 5 Dockerfile.j2 files that had the issue Change-Id: I8a5551050a75d64712c36d53573437a18777a82f
Diffstat (limited to 'tools')
-rwxr-xr-xtools/validate-indentation.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/validate-indentation.sh b/tools/validate-indentation.sh
index f651e152b..5fc1057cf 100755
--- a/tools/validate-indentation.sh
+++ b/tools/validate-indentation.sh
@@ -8,6 +8,12 @@ for dockerfile in "$@"; do
grep -E '^\s+[[:upper:]]+\s+' "$dockerfile"
RES=1
fi
+
+ if grep -qE '^\s+\{\{ macros\.install_packages' "$dockerfile"; then
+ echo "ERROR: $dockerfile has indented Dockerfile instruction" >&2
+ grep -E '^\s+\{\{ macros\.install_packages' "$dockerfile"
+ RES=1
+ fi
done
exit $RES