revert #2039

PR 2039 broke dockerlatent start

master/buildbot/test/unit/test_worker_docker.py

@@ -55,11 +55,6 @@ def test_constructor_image_nodockerfile(self):
         self.assertEqual(bs.dockerfile, None)
         self.assertEqual(bs.image, 'myworker')
 
-    def test_constructor_networking_config(self):
-        bs = self.ConcreteWorker(
-            'bot', 'pass', 'http://localhost:2375', 'worker', networking_config='host')
-        self.assertEqual(bs.networking_config, 'host')
-
     def test_constructor_minimal(self):
         # Minimal set of parameters
         bs = self.ConcreteWorker('bot', 'pass', 'tcp://1234:2375', 'worker')

master/buildbot/worker/docker.py

@@ -59,7 +59,7 @@ class DockerLatentWorker(AbstractLatentWorker):
 
     def __init__(self, name, password, docker_host, image=None, command=None,
                  volumes=None, dockerfile=None, version=None, tls=None, followStartupLogs=False,
-                 masterFQDN=None, hostconfig=None, networking_config='bridge', **kwargs):
+                 masterFQDN=None, hostconfig=None, **kwargs):
 
         if not client:
             config.error("The python module 'docker-py>=1.4' is needed to use a"
@@ -70,7 +70,6 @@ def __init__(self, name, password, docker_host, image=None, command=None,
 
         self.volumes = volumes or []
         self.binds = {}
-        self.networking_config = networking_config
         self.followStartupLogs = followStartupLogs
 
         # Following block is only for checking config errors,
@@ -185,8 +184,7 @@ def _thd_start_instance(self, image, volumes):
             name='%s_%s' % (self.workername, id(self)),
             volumes=self.volumes,
             environment=self.createEnvironment(),
-            host_config=host_conf,
-            networking_config=self.networking_config
+            host_config=host_conf
         )
 
         if instance.get('Id') is None:

master/docs/manual/cfg-workers-docker.rst

@@ -186,7 +186,7 @@ In addition to the arguments available for any :ref:`Latent-Workers`, :class:`Do
     (optional if ``dockerfile`` is given)
     This is the name of the image that will be started by the build master. It should start a worker.
     This option can be a renderable, like :ref:`Interpolate`, so that it generates from the build request properties.
-    
+
 ``command``
     (optional)
     This will override the command setup during image creation.
@@ -225,9 +225,6 @@ In addition to the arguments available for any :ref:`Latent-Workers`, :class:`Do
     (optional)
     Extra host configuration parameters passed as a dictionary used to create HostConfig object. See `docker-py's HostConfig documentation <https://docker-py.readthedocs.io/en/latest/hostconfig/>`_ for all the supported options.
 
-``networking_config``
-  Set the network configuration for the docker container. It can be one the following: 'bridge', 'host', container:<NAME or ID>, none. The default is bridge. This option is equivalent to using the ``--net=`` command line parameter in docker. 
-
 Setting up Volumes
 ..................