Mount volume path as outer path in container

badwolf/builder.py

@@ -172,7 +172,7 @@ def run_in_container(self, docker_image_name):
             'CI': 'true',
             'CI_NAME': 'badwolf',
             'BADWOLF_COMMIT': self.commit_hash,
-            'BADWOLF_BUILD_DIR': '/mnt/src',
+            'BADWOLF_BUILD_DIR': self.context.clone_path,
             'BADWOLF_REPO_SLUG': self.context.repository,
             'BADWOLF_SCRIPT': script,
         })
@@ -187,7 +187,7 @@ def run_in_container(self, docker_image_name):
 
         volumes = {
             self.context.clone_path: {
-                'bind': '/mnt/src',
+                'bind': self.context.clone_path,
                 'mode': 'rw',
             },
         }
@@ -203,7 +203,7 @@ def run_in_container(self, docker_image_name):
             entrypoint=['/bin/sh', '-c'],
             command=['echo $BADWOLF_SCRIPT | base64 --decode | /bin/sh'],
             environment=environment,
-            working_dir='/mnt/src',
+            working_dir=self.context.clone_path,
             volumes=volumes,
             privileged=self.spec.privileged,
             stdin_open=False,

badwolf/context.py

@@ -1,20 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+
 import os
 import uuid
-import tempfile
-import platform
-
-from badwolf.utils import to_text
 
+from flask import current_app
 
-if platform.system() == 'Darwin':
-    # On macOS, tempfile.gettempdir function doesn't return '/tmp'
-    # But Docker for Mac can not mount the path returned by tempfile.gettempdir
-    # by default, so let's hardcode it to '/tmp'
-    TMP_PATH = '/tmp'  # nosec
-else:
-    TMP_PATH = tempfile.gettempdir()
+from badwolf.utils import to_text
 
 
 class Context(object):
@@ -39,8 +31,7 @@ def __init__(self, repository, actor, type, message, source, target=None,
             self.source['repository'] = {'full_name': repository}
 
         self.clone_path = os.path.join(
-            TMP_PATH,
-            'badwolf',
-            self.task_id,
+            current_app.config['BADWOLF_REPO_DIR'],
             self.repo_name,
+            self.task_id,
         )

badwolf/default_settings.py

@@ -4,6 +4,8 @@
 import os
 import sys
 import base64
+import tempfile
+import platform
 
 import raven
 
@@ -81,7 +83,17 @@
 BITBUCKET_USERNAME = os.environ.get('BITBUCKET_USERNAME', '')
 BITBUCKET_PASSWORD = os.environ.get('BITBUCKET_PASSWORD', '')
 
-BADWOLF_LOG_DIR = os.environ.get('BADWOLF_LOG_DIR', '/var/lib/badwolf/log')
+BADWOLF_DATA_DIR = os.environ.get('BADWOLF_DATA_DIR', '/var/lib/badwolf')
+BADWOLF_LOG_DIR = os.environ.get('BADWOLF_LOG_DIR', os.path.join(BADWOLF_DATA_DIR, 'log'))
+BADWOLF_REPO_DIR = os.environ.get('BADWOLF_REPO_DIR', os.path.join(BADWOLF_DATA_DIR, 'repos'))
+if DEBUG:
+    if platform.system() == 'Darwin':
+        # On macOS, tempfile.gettempdir function doesn't return '/tmp'
+        # But Docker for Mac can not mount the path returned by tempfile.gettempdir
+        # by default, so let's hardcode it to '/tmp'
+        BADWOLF_REPO_DIR = '/tmp/badwolf'  # nosec
+    else:
+        BADWOLF_REPO_DIR = os.path.join(tempfile.gettempdir(), 'badwolf')
 
 # Sentry Release
 try: