Add support for changing network.

README.md

@@ -51,7 +51,7 @@ At present docker-rerun supports copying a number of commonly used arguments:
  * Labels (-l/--label)
  * Links (--link)
  * Names (--name)
- * Networks (--net)
+ * Networks (--network)
  * Port publications (-p)
  * Restart policies (--restart)
  * User switching (-u/--user)
@@ -79,6 +79,7 @@ of the container's parameters.
                             would happen.
       --pull                Docker pull the image before re-running the container
       --image IMAGE         Image to use in place of the original
+      --network NETWORK     The new network configuration to use
       --port PORT, -p PORT  Additional port to expose
       --tag TAG             Image tag (version) to use
 

docker_rerun.py

@@ -165,7 +165,7 @@ def handle_network_mode(container):
     """Copies the network mode (--net) argument."""
     network = container.info['HostConfig']['NetworkMode']
     if network != 'default':
-        container.args.append('--net=%s' % network)
+        container.args.append('--network=%s' % network)
 
 
 def handle_ports(container):
@@ -219,6 +219,18 @@ def modify_image(parser=None, args=None, container=None):
         container.image = args.image
 
 
+def modify_network(parser=None, args=None, container=None):
+    """Allows the network to be modified."""
+    if parser:
+        parser.add_argument('--network',
+                            help='The new network configuration to use')
+    elif args.network:
+        # Get rid of any existing network options, and add the new one
+        container.args = [a for a in container.args
+                          if not a.startswith('--network=')]
+        container.args.extend(['--network=%s' % args.network])
+
+
 def modify_port_add(parser=None, args=None, container=None):
     """Allows a additional ports to be exposed."""
     if parser:

test.py

@@ -39,12 +39,12 @@ def test_command_matches():
     yield check, ['docker', 'run', '--env=FOO=bar baz', '--name=test123', '-d', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '--restart=always', '-d', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '--restart=on-failure:10', '-d', 'hello-world']
-    yield check, ['docker', 'run', '--name=test123', '--net=host', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--network=host', '-d', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '-d', '-p=127.0.0.1:443:443', '-p=127.0.0.1::1336/udp', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '-d', '-p=443', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '-d', '-p=80:80', '-p=90', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '--user=root', '-d', 'hello-world', '/hello', 'foobar']
-    yield check, ['docker', 'run', '--name=test123', '--net=host', '--user=root:root', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--network=host', '--user=root:root', '-d', 'hello-world']
     yield check, ['docker', 'run', '--name=test123', '--volume=/dev/null:/null', '--volume=/dev/urandom:/mnt/random', '-d', 'hello-world']
     yield check, ['docker', 'run', '--label=com.example=123 456', '--name=test123', '-d', 'hello-world']
     yield check, ['docker', 'run', '--label=com.example.1', '--label=com.example.2=345', '--name=test123', '-d', 'hello-world']
@@ -73,6 +73,14 @@ def test_modifiers():
            ['docker', 'run', '--name=test123', '-d', 'hello-world'],
            ['--tag', 'latest'],
            ['docker', 'run', '--name=test123', '-d', 'hello-world:latest'])
+    yield (check,
+           ['docker', 'run', '--name=test123', '-d', 'hello-world'],
+           ['--network', 'none'],
+           ['docker', 'run', '--name=test123', '--network=none', '-d', 'hello-world'])
+    yield (check,
+           ['docker', 'run', '--name=test123', '--network=host', '-d', 'hello-world'],
+           ['--network', 'none'],
+           ['docker', 'run', '--name=test123', '--network=none', '-d', 'hello-world'])
 
 
 @with_setup(setup_each, teardown_each)