File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3232import time
3333import multiprocessing as mp
3434
35- # A future version of Cekit will expose this to us, for now we hard-code
36- DOCKER_API_VERSION = "1.35"
35+ DOCKER_MIN_API_VERSION = os .getenv ("DOCKER_MIN_API_VERSION" , "1.44" )
3736
38- base_url = os .environ . get ("DOCKER_HOST" , docker .constants .DEFAULT_UNIX_SOCKET )
39- d = docker .APIClient (version = DOCKER_API_VERSION , base_url = base_url )
37+ base_url = os .getenv ("DOCKER_HOST" , docker .constants .DEFAULT_UNIX_SOCKET )
38+ d = docker .APIClient (version = DOCKER_MIN_API_VERSION , base_url = base_url )
4039
4140
4241class ExecException (Exception ):
@@ -259,4 +258,3 @@ def _create_container(self, **kwargs):
259258 volumes = volume_mount_points ,
260259 host_config = d .create_host_config (** host_args ),
261260 ** kwargs )
262-
Original file line number Diff line number Diff line change 44
55from behave import then
66
7- # A future version of Cekit will expose this to us, for now we hard-code
8- DOCKER_API_VERSION = "1.35"
7+ DOCKER_MIN_API_VERSION = os .getenv ("DOCKER_MIN_API_VERSION" , "1.44" )
98
10- base_url = os .environ . get ("DOCKER_HOST" , docker .constants .DEFAULT_UNIX_SOCKET )
11- DOCKER_CLIENT = docker .APIClient (version = DOCKER_API_VERSION , base_url = base_url )
9+ base_url = os .getenv ("DOCKER_HOST" , docker .constants .DEFAULT_UNIX_SOCKET )
10+ DOCKER_CLIENT = docker .APIClient (version = DOCKER_MIN_API_VERSION , base_url = base_url )
1211
1312@then (u'the image should contain label {label}' )
1413@then (u'the image should contain label {label} {check} value {value}' )
You can’t perform that action at this time.
0 commit comments