dns backwards check

kinkerl · kinkerl · commit b7621f6ee78f · 2019-01-09T09:37:26.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+3.3.12 (2019-01-09)
+------------------------
+
+* Updated DNS check to be backwards compatible
+
+
 3.3.11 (2019-01-09)
 ------------------------
 
diff --git a/divio_cli/__init__.py b/divio_cli/__init__.py
@@ -1 +1 @@
-__version__ = "3.3.11"
+__version__ = "3.3.12"
diff --git a/divio_cli/check_system.py b/divio_cli/check_system.py
@@ -177,7 +177,7 @@ class DockerEngineDNSCheck(DockerEngineBaseCheck):
         "busybox",
         "sh",
         "-c",  # run in new a shell to avoid problems with timeout
-        "timeout 5 nslookup -type=a control.divio.com.",
+        "timeout 5 nslookup -type=a control.divio.com. || timeout -t 5 nslookup -type=a control.divio.com.",
     )
 
     def fmt_exception(self, exc):

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ class DockerEngineDNSCheck(DockerEngineBaseCheck):`
`177`	`177`	`"busybox",`
`178`	`178`	`"sh",`
`179`	`179`	`"-c", # run in new a shell to avoid problems with timeout`
`180`		`- "timeout 5 nslookup -type=a control.divio.com.",`
	`180`	`+ "timeout 5 nslookup -type=a control.divio.com. \|\| timeout -t 5 nslookup -type=a control.divio.com.",`
`181`	`181`	`)`
`182`	`182`
`183`	`183`	`def fmt_exception(self, exc):`