Add support for labels

README.md

@@ -7,7 +7,7 @@ containers using the same arguments you used previously.
 Want to update to a newer image, or add a missing port publication?
 docker-rerun's got you covered.
 
-## How to use
+## How to use it
 
 In the most basic usage, you pass in a container name and it will be
 stopped, deleted and recreated:
@@ -28,6 +28,7 @@ At present docker-rerun supports a small number of commonly used arguments:
 
     * Commands (trailing arguments)
     * Environment variables (-e/--env)
+    * Labels (-l/--label)
     * Names (--name)
     * Networks (--net)
     * Port publications (-p)
@@ -39,9 +40,9 @@ At present docker-rerun supports a small number of commonly used arguments:
 
 Many other command line arguments:
 
-    * Labels
     * Linking and aliases
     * Permissions and policies
+    * Advanced networking options
 
 Additional options to allow mutating the container config when rerunning.
 For example:

docker-rerun

@@ -123,6 +123,18 @@ def handle_image(container):
     container.image = container.info['Config']['Image']
 
 
+def handle_labels(container):
+    """Copies the label (-l/--label) arguments."""
+    container_labels = set((container.info['Config']['Labels'] or {}).items())
+    image_labels = set((container.image_info['Config']['Labels'] or {}).items())
+    delta = container_labels - image_labels
+    for key, value in delta:
+        if value:
+            container.args.append('--label=%s=%s' % (key, value))
+        else:
+            container.args.append('--label=%s' % key)
+
+
 def handle_name(container):
     """Copies the name (--name) argument."""
     # Trim the leading / off the name. They're equivalent from docker's point

test.py

@@ -22,7 +22,10 @@ def _run(cmd):
     ['docker', 'run', '--name=test123', '-d', '-p=127.0.0.1:443:443/tcp', '-p=127.0.0.1::1336/tcp', 'hello-world'],
     ['docker', 'run', '--name=test123', '-d', '-p=443/tcp', 'hello-world'],
     ['docker', 'run', '--name=test123', '--user=root', '-d', 'hello-world', '/hello', 'foobar'],
+    ['docker', 'run', '--name=test123', '--net=host', '--user=root:root', '-d', 'hello-world'],
     ['docker', 'run', '--name=test123', '--volume=/dev/null:/null', '--volume=/dev/urandom:/mnt/random', '-d', 'hello-world'],
+    ['docker', 'run', '--label=com.example=123 456', '--name=test123', '-d', 'hello-world'],
+    ['docker', 'run', '--label=com.example.1', '--label=com.example.2=345', '--name=test123', '-d', 'hello-world'],
 ])
 def test_command_matches(*command):
     _run(['docker', 'rm', '-f', 'test123'])