Merge branch 'master' of https://github.com/SpheMakh/Stimela

Author: SpheMakh

stimela/cargo/base/tricolour/Dockerfile

@@ -5,3 +5,6 @@ RUN echo -e '#!/bin/bash\npython3' > /usr/bin/python && \
 RUN alias
 ENTRYPOINT ["/bin/bash", "-c"]
 
+RUN pip3 install pyyaml
+
+ENTRYPOINT []

stimela/cargo/cab/tricolour/parameters.json

@@ -4,7 +4,7 @@
     "tag": "1.1.3", 
     "description": "A variant of the Science Data Processing flagging code, wrapped in dask, operating on Measurement Sets", 
     "prefix": "--", 
-    "binary": "tricolour", 
+    "binary": "/code/dist/tricolourexe/tricolourexe", 
     "msdir": true, 
     "parameters": [
         {

stimela/cargo/cab/tricolour/src/run.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-python /scratch/code/run.py 2>&1 | tee -a $LOGFILE 
+/usr/bin/env python3 /scratch/code/run.py 2>&1 | tee -a $LOGFILE 
 (exit ${PIPESTATUS[0]})

stimela/docker.py

@@ -36,13 +36,13 @@ def build(image, build_path, tag=None, build_args=None, fromline=None, args=[]):
             else:
                 stdw.write(line)
         stdw.flush()
-        utils.xrun("docker build", args+["--force-rm", "-f", stdw.name, 
+        utils.xrun("docker build", args+["--force-rm", "--no-cache", "-f", stdw.name, 
                    "-t", image, 
                     bdir])
 
         stdw.close()
     else:
-        utils.xrun("docker build", args+["--force-rm", "-t", image, 
+        utils.xrun("docker build", args+["--force-rm", "--no-cache", "-t", image, 
                     bdir])
 
     os.system('rm -rf {:s}'.format(bdir))