From 2008f5dcc583e351af3035eb810d64782816ea56 Mon Sep 17 00:00:00 2001
From: johnwesley <wesley@echoboat.org>
Date: Tue, 9 Apr 2019 14:50:50 -0400
Subject: [PATCH] fix merge conflict

---
 tests/local-deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/local-deploy.sh b/tests/local-deploy.sh
index e1d7d244..50ad164e 100755
--- a/tests/local-deploy.sh
+++ b/tests/local-deploy.sh
@@ -6,7 +6,7 @@ DEPLOY_ARGS="provider=local server=$LXC_IP ssh_user=ubuntu endpoint=$LXC_IP appa
 
 if [ "${LXC_NAME}" == "docker" ]
 then
-  docker run -it -v $(pwd)/config.cfg:/algo/config.cfg -v ~/.ssh:/root/.ssh -v $(pwd)/configs:/algo/configs -e "DEPLOY_ARGS=${DEPLOY_ARGS}" trailofbits/algo /bin/sh -c "chown -R 0:0 /root/.ssh && source env/bin/activate && ansible-playbook main.yml -e \"${DEPLOY_ARGS}\" --skip-tags apparmor"
+  make docker-test-local
 else
   ansible-playbook main.yml -e "${DEPLOY_ARGS}" --skip-tags apparmor
 fi