Support for env vars

README.md

@@ -27,17 +27,18 @@ option:
 At present docker-rerun supports a small number of commonly used arguments:
 
     * Commands (trailing arguments)
+    * Environment variables (-e/--env)
     * Names (--name)
     * Networks (--net)
     * Port publications (-p)
     * Restart policies (--restart)
+    * User switching (-u/--user)
     * Volumes (-v/--volume, and --volumes-from)
 
 ## What's not done yet
 
 Many other command line arguments:
 
-    * Environment variables
     * Labels
     * Linking and aliases
     * Permissions and policies

docker-rerun

@@ -110,6 +110,14 @@ def handle_command(container):
     container.cmd = container.if_image_diff(lambda c: c['Config']['Cmd'], [])
 
 
+def handle_environment(container):
+    """Copies the environment (-e/--env) arguments."""
+    container_env = container.info['Config']['Env'] or []
+    image_env = container.image_info['Config']['Env'] or []
+    delta = [e for e in container_env if e not in image_env]
+    container.args.extend(['--env=%s' % env for env in delta])
+
+
 def handle_image(container):
     """Copies the image argument."""
     container.image = container.info['Config']['Image']

test.py

@@ -11,22 +11,24 @@ def _run(cmd):
 
 
 @parameterized([
-    'docker run --name=test123 -d hello-world',
-    'docker run --name=test123 -d hello-world:latest',
-    'docker run --name=test123 -d hello-world /hello world...',
-    'docker run --name=test123 --restart=always -d hello-world',
-    'docker run --name=test123 --restart=on-failure:10 -d hello-world',
-    'docker run --name=test123 --net=host -d hello-world',
-    '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 --volume=/dev/null:/null --volume=/dev/urandom:/mnt/random -d hello-world',
+    ['docker', 'run', '--name=test123', '-d', 'hello-world'],
+    ['docker', 'run', '--name=test123', '-d', 'hello-world:latest'],
+    ['docker', 'run', '--name=test123', '-d', 'hello-world', '/hello', 'world...'],
+    ['docker', 'run', '--env=PATH=/root', '--env=Z=X', '--name=test123', '-d', 'hello-world'],
+    ['docker', 'run', '--env=FOO=bar baz', '--name=test1234', '-d', 'hello-world'],
+    ['docker', 'run', '--name=test123', '--restart=always', '-d', 'hello-world'],
+    ['docker', 'run', '--name=test123', '--restart=on-failure:10', '-d', 'hello-world'],
+    ['docker', 'run', '--name=test123', '--net=host', '-d', 'hello-world'],
+    ['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', '--volume=/dev/null:/null', '--volume=/dev/urandom:/mnt/random', '-d', 'hello-world'],
 ])
-def test_command_matches(command):
+def test_command_matches(*command):
     _run(['docker', 'rm', '-f', 'test123'])
-    _run(command.split(' '))
+    _run(command)
     output = subprocess.check_output(['./docker-rerun', '--dry-run', 'test123'])
     output = output.decode('utf-8').strip().splitlines()
-    assert output[3] == command
+    assert output[3] == ' '.join(command)
     _run(['docker', 'rm', '-f', 'test123'])