Merge pull request #972 from vdice/use-shell-dev

ref(Makefile,.travis.yml): run shellcheck in container

Author: Vaughn Dice

.travis.yml

@@ -6,13 +6,12 @@ branches:
     - master
 services:
   - postgresql
+  - docker
 sudo: required
 addons:
   postgresql: "9.4"
 cache: pip
 before_install:
-  - wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.3.7-5_amd64.deb"
-  - sudo dpkg -i shellcheck_0.3.7-5_amd64.deb
   - createdb -U postgres deis
 install:
   - pip install -r rootfs/requirements.txt

Makefile

@@ -6,6 +6,7 @@ SHORT_NAME ?= $(COMPONENT)
 
 include versioning.mk
 
+SHELLCHECK_PREFIX := docker run --rm -v ${CURDIR}:/workdir -w /workdir quay.io/deis/shell-dev shellcheck
 SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
 
 # Test processes used in quick unit testing
@@ -60,7 +61,7 @@ test-check:
 
 test-style:
 	cd rootfs && flake8 --show-pep8 --show-source
-	shellcheck $(SHELL_SCRIPTS)
+	${SHELLCHECK_PREFIX} $(SHELL_SCRIPTS)
 
 test-unit:
 	cd rootfs \