From 617d187c7b30fd8c34cbdfc480f7e76b3e868cbf Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Fri, 18 Oct 2019 11:47:53 +0200
Subject: [PATCH] Add scripts path to ENV
Former-commit-id: 2787386c252fe625138630e083866fdce94de9e2
---
Docker/Dockerfile | 11 +++++++----
Docker/build_docker.sh | 6 +++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 0ab3a36a..ac682c48 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 45d397f2..e16e7fe0 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
--
GitLab