diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 0ab3a36af3de2d991f49951f1b88b735b9abffca..ac682c48d1b459fa6b25e9814940c1145f348d00 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,15 +1,18 @@ FROM lofar/lofar-pipeline SHELL ["/bin/bash", "-c"] -RUN mkdir /home/lofaruser/ && groupadd -r lofaruser && useradd --no-log-init -r -g lofaruser lofaruser +RUN mkdir /home/lofaruser/ && \ + groupadd -r lofaruser && \ + useradd --no-log-init -r -g lofaruser lofaruser && \ + chown lofaruser:lofaruser /home/lofaruser -RUN apt-get update && apt-get install -y nodejs python3-pip -RUN python3 -m pip install cwltool cwl-runner +RUN apt-get update && apt-get install -y nodejs python3-pip git +RUN python3 -m pip install cwltool cwl-runner git+https://github.com/darafferty/LSMTool ADD L570745_uv_first10.MS.tar.xz /data COPY scripts/* /usr/local/bin/ RUN chmod +rx /usr/local/bin/* - +ENV PYTHONPATH="/usr/local/bin:${PYTHONPATH}" #ENTRYPOINT ["/home/lofaruser/.entrypoint"] USER lofaruser diff --git a/Docker/build_docker.sh b/Docker/build_docker.sh index 45d397f27ae40e9026acf46daffcd89eeebf60a4..e16e7fe085650472f136a6989b4e5cf74b471b7b 100755 --- a/Docker/build_docker.sh +++ b/Docker/build_docker.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#! /bin/bash BRANCH=production REPO_URL=https://github.com/lofar-astron/prefactor # FETCHES THE SCRIPTS ONLY svn checkout ${REPO_URL}/branches/${BRANCH}/scripts SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]}) -PATH=$(dirname ${SCRIPT_PATH}) +DOCKER_PATH=$(dirname ${SCRIPT_PATH}) -docker build $PATH -t prefactor:latest +docker build ${DOCKER_PATH} -t prefactor:latest