fix merge conflict

This commit is contained in:
johnwesley 2019-04-09 14:50:50 -04:00
parent e211873cf1
commit 2008f5dcc5

View file

@ -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