Merge branch 'release/1.3.1'

Author: mblaschke

CHANGELOG.md

@@ -29,8 +29,10 @@ applications: webdevops/typo3 webdevops/piwik
 
 misc:      webdevops/mail-sandbox webdevops/sphinx webdevops/liquibase
 
+setup:     requirements
+
 requirements:
-	pip install -r ./bin/requirements.txt
+	pip install --upgrade -I -r ./bin/requirements.txt
 	cd tests/serverspec && bundle install --path=vendor
 
 test:
@@ -45,24 +47,9 @@ provision:
 
 publish:    dist-update rebuild test old-test push
 
-dist-update:
-	docker pull centos:7
-	docker pull ubuntu:12.04
-	docker pull ubuntu:14.04
-	docker pull ubuntu:15.04
-	docker pull ubuntu:15.10
-	docker pull ubuntu:16.04
-	docker pull debian:7
-	docker pull debian:8
-	docker pull debian:stretch
-	docker pull alpine:3.4
-
 push:
 	python ./bin/console docker:push --threads=auto
 
-setup:
-	pip install --upgrade -I -r ./requirements.txt
-
 graph:
 	python ./bin/console generate:graph
 

Makefile

@@ -3,7 +3,7 @@ graphviz>=0.4.10
 cleo>=0.5.0
 yamlordereddictloader>=0.1.0
 testinfra>=1.4.2
-doit>=0.29.0
+doit==0.29.0
 termcolor>=1.1.0
 pytest-timeout>=1.0.0
 pytest-rerunfailures>=1.0.0

bin/requirements.txt

@@ -73,7 +73,7 @@
 
     'verbosity': 0,
     'threads': 1,
-    'retry': 5,
+    'retry': 1,
     'dryRun': False,
 }
 

bin/webdevops/Configuration.py

@@ -253,7 +253,8 @@ def get_retry(self):
         Get number of retries
         """
         default = 1
-        retry = max(0, int(self.option('retry')))
+        retry = os.getenv('RETRY', self.option('retry'))
+        retry = max(0, int(retry))
 
         if retry > 0:
             # user value

bin/webdevops/command/BaseCommand.py

@@ -127,6 +127,7 @@ def task_run(dockerfile, configuration, task):
         with open(test_dockerfile.name, mode='w', buffering=0) as f:
             f.write(dockerfile_content)
             f.flush()
+            os.fsync(f.fileno())
             f.close()
 
         test_status = False

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.3.0
+LABEL io.webdevops.version=1.3.1

docker/ansible/alpine-3/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.3.0
+LABEL io.webdevops.version=1.3.1

docker/ansible/centos-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.3.0
+LABEL io.webdevops.version=1.3.1

docker/ansible/debian-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.3.0
+LABEL io.webdevops.version=1.3.1