From 9d81a7c9e7ee64b67d1dee45c4819e3cbbb4c446 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Thu, 11 Jun 2020 09:52:34 +0200
Subject: [PATCH] Update dockerfiles
---
Docker/Dockerfile | 6 ++++--
Docker/build_docker.sh | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 1c67fe41..f804c524 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -3,8 +3,10 @@ USER root
COPY prefactor/scripts/* /opt/lofar/scripts/
COPY prefactor/skymodels/* /data/skymodels/
COPY prefactor/rfistrategies/* /data/rfistrategies/
-COPY prefactor/solutions/ /data/solutions/*
-RUN apt update && apt install -y vim
+COPY prefactor/solutions/* /data/solutions/
+COPY lofar /lofar/src
+
+RUN apt update && apt install -y vim
RUN pip3 install --upgrade pip && pip3 install --upgrade numpy scipy
RUN ln -sf /opt/lofar/scripts/* /usr/local/bin/
diff --git a/Docker/build_docker.sh b/Docker/build_docker.sh
index 58f6f1ae..f9a8351f 100755
--- a/Docker/build_docker.sh
+++ b/Docker/build_docker.sh
@@ -14,14 +14,14 @@ git_clone_or_pull () {
}
Prefactor_TAG=production
+LOFAR_TAG=LOFAR-Release-4_0_17
# FETCHES Prefactor
git_clone_or_pull https://github.com/lofar-astron/prefactor.git ${Prefactor_TAG} prefactor
-
+git_clone_or_pull https://git.astron.nl/ro/lofar.git ${LOFAR_TAG} lofar
SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]})
DOCKER_PATH=$(dirname ${SCRIPT_PATH})
docker build ${DOCKER_PATH} -t lofareosc/prefactor
-
docker build ${DOCKER_PATH} -f ${DOCKER_PATH}/Dockerfile_ci -t lofareosc/prefactor-ci
--
GitLab