Skip to content

Commit

Permalink
Move entrypoint scripts around tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jakirkham committed Apr 21, 2018
1 parent de3789f commit 77774e1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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

Expand Down

0 comments on commit 77774e1

Please sign in to comment.