Add support to lint the install commands in Dockerfiles

Change-Id: Icb47ba8b13b13889e28bb285321f11344400edc2
Closes-Bug:#1582618

4 files changed, 19 insertions, 3 deletions

diff --git a/tools/pre-commit-hook b/tools/pre-commit-hook
index a3c45b757..be7bc6db3 100755
--- a/tools/pre-commit-hook
+++ b/tools/pre-commit-hook
@@ -37,8 +37,8 @@ echo "=== json checks ==="
 
 ${TOPLEVEL}/tools/validate-all-json.sh || RES=1
 
-echo "=== maintainer checks ==="
+echo "=== dockerfile checks ==="
 
-${TOPLEVEL}/tools/validate-all-maintainer.sh || RES=1
+${TOPLEVEL}/tools/validate-all-dockerfiles || RES=1
 
 exit $RES
diff --git a/tools/validate-all-maintainer.sh b/tools/validate-all-dockerfiles.sh
index 32ac477ee..5a39d24c0 100755
--- a/tools/validate-all-maintainer.sh
+++ b/tools/validate-all-dockerfiles.sh
@@ -5,3 +5,7 @@ cd "$(dirname "$REAL_PATH")/.."
 
 find docker -name Dockerfile.j2 -print0 |
     xargs -0 tools/validate-maintainer.sh || exit 1
+
+find docker -name Dockerfile.j2 -print0 |
+    xargs -0 tools/validate-install-command.sh || exit 1
+
diff --git a/tools/validate-install-command.sh b/tools/validate-install-command.sh
new file mode 100755
index 000000000..bc7409690
--- /dev/null
+++ b/tools/validate-install-command.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+RES=0
+
+for dockerfile in "$@"; do
+    if grep "apt-get install\|yum install" "$dockerfile"; then
+        echo "ERROR: $dockerfile has incorrectly formatted install command Should be in the form 'apt-get|yum -y install ...'" >&2
+        RES=1
+    fi
+done
+
+exit $RES
diff --git a/tox.ini b/tox.ini
index d3cda4bc2..90af6ff70 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ commands =
   flake8 {posargs}
   {toxinidir}/tools/validate-all-json.sh
   {toxinidir}/tools/validate-all-yaml.sh
-  {toxinidir}/tools/validate-all-maintainer.sh
+  {toxinidir}/tools/validate-all-dockerfiles.sh
 
 [testenv:bandit]
 commands = bandit -r ansible/library dev docker kolla tests tools