From 77774e127d24c4b0dc62f0a6e65c26d164e55c03 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sat, 21 Apr 2018 17:06:34 -0400 Subject: [PATCH] Move entrypoint scripts around tests Simply call `python setup.py test` through the entrypoint scripts. This works as intended in the `nanshe/nashe:sge` build's tests. So should also work here for the same intended purpose. --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a6dfd7..96caa24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ RUN rm -f /tmp/test.sh && \ echo -e " . /opt/conda${PYTHON_VERSION}/etc/profile.d/conda.sh && " >> /tmp/test.sh && \ echo -e " conda activate base && " >> /tmp/test.sh && \ echo -e " cd /nanshe_workflow && " >> /tmp/test.sh && \ - echo -e " python${PYTHON_VERSION} setup.py test && " >> /tmp/test.sh && \ + echo -e " /usr/share/docker/entrypoint.sh /usr/share/docker/entrypoint_2.sh /usr/share/docker/entrypoint_3.sh python${PYTHON_VERSION} setup.py test && " >> /tmp/test.sh && \ echo -e " (qdel -f -u root || true) && " >> /tmp/test.sh && \ echo -e " qstat && " >> /tmp/test.sh && \ echo -e " service sge_execd stop && " >> /tmp/test.sh && \ @@ -67,9 +67,6 @@ RUN rm -f /tmp/test.sh && \ echo -e " rm -rf ~/ipengine.e* && " >> /tmp/test.sh && \ echo -e " conda deactivate ; " >> /tmp/test.sh && \ echo -e "done" >> /tmp/test.sh && \ - /usr/share/docker/entrypoint.sh \ - /usr/share/docker/entrypoint_2.sh \ - /usr/share/docker/entrypoint_3.sh \ /tmp/test.sh && \ rm /tmp/test.sh