From e904d47122942d57e7c16c0c4a287e23c423fbe1 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Tue, 25 Jul 2017 14:01:43 -0400
Subject: [PATCH] Fix unit test runs

---
 tools/docker-compose/unit-tests/Dockerfile         |  6 ++++--
 tools/docker-compose/unit-tests/docker-compose.yml |  2 +-
 tools/docker-compose/unit-tests/entrypoint.sh      | 10 ++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 tools/docker-compose/unit-tests/entrypoint.sh

diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile
index 98f6ce7069..9398c89398 100644
--- a/tools/docker-compose/unit-tests/Dockerfile
+++ b/tools/docker-compose/unit-tests/Dockerfile
@@ -7,5 +7,7 @@ RUN npm set progress=false
 
 WORKDIR "/awx_devel"
 
-ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["bash"]
+ADD tools/docker-compose/unit-tests/entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/tools/docker-compose/unit-tests/docker-compose.yml b/tools/docker-compose/unit-tests/docker-compose.yml
index c71cf02e8a..8f5cc07c20 100644
--- a/tools/docker-compose/unit-tests/docker-compose.yml
+++ b/tools/docker-compose/unit-tests/docker-compose.yml
@@ -9,6 +9,6 @@ services:
     environment:
       SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
       TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests
-    command: ["cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link; make test"]
+    command: ["make test"]
     volumes:
       - ../../../:/awx_devel
diff --git a/tools/docker-compose/unit-tests/entrypoint.sh b/tools/docker-compose/unit-tests/entrypoint.sh
new file mode 100644
index 0000000000..63190314b9
--- /dev/null
+++ b/tools/docker-compose/unit-tests/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Code duplicated from start_development.sh
+cp -R /tmp/ansible_awx.egg-info /awx_devel/ || true
+sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/ansible_awx.egg-info/PKG-INFO
+cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link
+
+cp -f awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py
+
+/bin/bash -c "$@"