aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.sh9
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini8
3 files changed, 14 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index c699b1eb..7d78afeb 100644
--- a/build.sh
+++ b/build.sh
@@ -17,11 +17,14 @@ build_opts=(--pull=true --no-cache --force-rm=true)
for arch in ${arch};do
if [[ ${arch} == arm64 ]]; then
- find . -name Dockerfile -exec sed -i -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
+ find . -name Dockerfile -exec sed -i \
+ -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
fi
- (cd docker && docker build "${build_opts[@]}" -t "${repo}/${image}:${arch}-${tag}" .)
+ (cd docker && docker build "${build_opts[@]}" \
+ -t "${repo}/${image}:${arch}-${tag}" .)
docker push "${repo}/${image}:${arch}-${tag}"
- [ "$?" == "0" ] && (sudo docker rmi "${repo}/${image}:${arch}-${tag}"|| true)
+ [ "$?" == "0" ] &&
+ (sudo docker rmi "${repo}/${image}:${arch}-${tag}"|| true)
find . -name Dockerfile -exec git checkout \{\} +;
done
exit $?
diff --git a/test-requirements.txt b/test-requirements.txt
index baa806e8..9fd35148 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,3 +10,4 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
sphinx-rtd-theme
yamllint
doc8>=0.6.0 # Apache-2.0
+bashate>=0.5.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 00a51bd7..98d71403 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,bashate,py35,py27,perm,cover
[testenv]
usedevelop = True
@@ -43,6 +43,12 @@ commands =
[testenv:py35]
commands = nosetests xtesting/tests/unit
+[testenv:bashate]
+basepython = python2.7
+files =
+ build.sh
+commands = bashate {[testenv:bashate]files}
+
[testenv:cover]
basepython = python2.7
dirs =