From 658803edf885f490168e223d07b2b1a2cbd22aae Mon Sep 17 00:00:00 2001
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
Date: Mon, 22 Feb 2016 21:05:59 +0100
Subject: [PATCH] Add -w or --workdir to compose run to override workdir from
 commandline

Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
---
 compose/cli/main.py                           |  4 ++++
 docs/reference/run.md                         |  1 +
 tests/acceptance/cli_test.py                  | 18 ++++++++++++++++++
 tests/fixtures/run-workdir/docker-compose.yml |  4 ++++
 tests/unit/cli_test.py                        |  3 +++
 5 files changed, 30 insertions(+)
 create mode 100644 tests/fixtures/run-workdir/docker-compose.yml

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 6636216828..146b77b4cc 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -527,6 +527,7 @@ class TopLevelCommand(object):
                                   to the host.
             -T                    Disable pseudo-tty allocation. By default `docker-compose run`
                                   allocates a TTY.
+            -w, --workdir=""      Working directory inside the container
         """
         service = self.project.get_service(options['SERVICE'])
         detach = options['-d']
@@ -576,6 +577,9 @@ class TopLevelCommand(object):
         if options['--name']:
             container_options['name'] = options['--name']
 
+        if options['--workdir']:
+            container_options['working_dir'] = options['--workdir']
+
         run_one_off_container(container_options, self.project, service, options)
 
     def scale(self, options):
diff --git a/docs/reference/run.md b/docs/reference/run.md
index 21890c60a9..863544246d 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -26,6 +26,7 @@ Options:
 -p, --publish=[]      Publish a container's port(s) to the host
 --service-ports       Run command with the service's ports enabled and mapped to the host.
 -T                    Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.
+-w, --workdir=""      Working directory inside the container
 ```
 
 Runs a one-time command against a service. For example, the following command starts the `web` service and runs `bash` as its command.
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 825b97bed0..a712de8a6c 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -1025,6 +1025,24 @@ class CLITestCase(DockerClientTestCase):
         container, = service.containers(stopped=True, one_off=True)
         self.assertEqual(container.name, name)
 
+    def test_run_service_with_workdir_overridden(self):
+        self.base_dir = 'tests/fixtures/run-workdir'
+        name = 'service'
+        workdir = '/var'
+        self.dispatch(['run', '--workdir={workdir}'.format(workdir=workdir), name])
+        service = self.project.get_service(name)
+        container = service.containers(stopped=True, one_off=True)[0]
+        self.assertEqual(workdir, container.get('Config.WorkingDir'))
+
+    def test_run_service_with_workdir_overridden_short_form(self):
+        self.base_dir = 'tests/fixtures/run-workdir'
+        name = 'service'
+        workdir = '/var'
+        self.dispatch(['run', '-w', workdir, name])
+        service = self.project.get_service(name)
+        container = service.containers(stopped=True, one_off=True)[0]
+        self.assertEqual(workdir, container.get('Config.WorkingDir'))
+
     @v2_only()
     def test_run_interactive_connects_to_network(self):
         self.base_dir = 'tests/fixtures/networks'
diff --git a/tests/fixtures/run-workdir/docker-compose.yml b/tests/fixtures/run-workdir/docker-compose.yml
new file mode 100644
index 0000000000..dc3ea86a0f
--- /dev/null
+++ b/tests/fixtures/run-workdir/docker-compose.yml
@@ -0,0 +1,4 @@
+service:
+  image: busybox:latest
+  working_dir: /etc
+  command: /bin/true
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index 1d7c13e7e9..e0ada460d6 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -102,6 +102,7 @@ class CLITestCase(unittest.TestCase):
                 '--publish': [],
                 '--rm': None,
                 '--name': None,
+                '--workdir': None,
             })
 
         _, _, call_kwargs = mock_run_operation.mock_calls[0]
@@ -135,6 +136,7 @@ class CLITestCase(unittest.TestCase):
             '--publish': [],
             '--rm': None,
             '--name': None,
+            '--workdir': None,
         })
 
         self.assertEquals(
@@ -156,6 +158,7 @@ class CLITestCase(unittest.TestCase):
             '--publish': [],
             '--rm': True,
             '--name': None,
+            '--workdir': None,
         })
 
         self.assertFalse(