@@ -554,13 +554,16 @@ class DockerBuildEnvironment(BuildEnvironment):
554
554
container_time_limit = DOCKER_LIMITS .get ('time' )
555
555
556
556
def __init__ (self , * args , ** kwargs ):
557
- container_image = kwargs .pop (' container_image' , None )
558
-
557
+ container_image = kwargs .pop (" container_image" , None )
558
+ self . use_gvisor = kwargs . pop ( "use_gvisor" , False )
559
559
super ().__init__ (* args , ** kwargs )
560
560
self .client = None
561
561
self .container = None
562
562
self .container_name = self .get_container_name ()
563
563
564
+ if self .project .has_feature (Feature .DOCKER_GVISOR_RUNTIME ):
565
+ self .use_gvisor = True
566
+
564
567
# Decide what Docker image to use, based on priorities:
565
568
# Use the Docker image set by our feature flag: ``testing`` or,
566
569
if self .project .has_feature (Feature .USE_TESTING_BUILD_IMAGE ):
@@ -790,11 +793,7 @@ def create_container(self):
790
793
"""Create docker container."""
791
794
client = self .get_client ()
792
795
try :
793
- docker_runtime = self .project .get_feature_value (
794
- Feature .DOCKER_GVISOR_RUNTIME ,
795
- positive = "runsc" ,
796
- negative = None ,
797
- )
796
+ docker_runtime = "runsc" if self .use_gvisor else None
798
797
log .info (
799
798
'Creating Docker container.' ,
800
799
container_image = self .container_image ,
0 commit comments