From fdbf709a3b68f593f25de3d97c5600d5f78eec93 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 3 Dec 2018 21:15:58 +0000
Subject: [PATCH] Task LSMR-102: Remove superfluous hotpatch, lingering use of
fixed LSMR-epic branch
---
SAS/LSMR/docker/lsmr/Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/SAS/LSMR/docker/lsmr/Dockerfile b/SAS/LSMR/docker/lsmr/Dockerfile
index 370020f277a..a42a6a1185f 100644
--- a/SAS/LSMR/docker/lsmr/Dockerfile
+++ b/SAS/LSMR/docker/lsmr/Dockerfile
@@ -19,9 +19,9 @@ RUN apt-get -y install python3-pip && pip3 install django djangorestframework dj
RUN mkdir /src && \
cd /src && \
svn co -N https://svn.astron.nl/LOFAR/branches/$BRANCH/ && \
- cd LSMR-epic && \
+ cd $BRANCH/ && \
svn up CMake
-RUN mkdir -p /build/gnu_debug && cd /build/gnu_debug && cmake /src/LSMR-epic -DBUILD_PACKAGES=LSMR -DCMAKE_INSTALL_PREFIX=/opt/lofar && make -j 8 && make -j 8 install
+RUN mkdir -p /build/gnu_debug && cd /build/gnu_debug && cmake /src/$BRANCH/ -DBUILD_PACKAGES=LSMR -DCMAKE_INSTALL_PREFIX=/opt/lofar && make -j 8 && make -j 8 install
# Configure authentication
ADD dbcreds.ini /opt/lofar/etc/dbcredentials/lsmr.ini
@@ -33,7 +33,6 @@ EXPOSE 8000
RUN echo "ALLOWED_HOSTS=['*']" >> /opt/lofar/lib/python3.6/site-packages/lofar/sas/lsmr/lsmr/settings.py
# Hot patches
-RUN sed -i "s/PASS/PASSWORD/" /opt/lofar/lib/python3.6/site-packages/lofar/sas/lsmr/lsmr/settings.py
# Run LOFAR app
CMD bash -c 'source /opt/lofar/lofarinit.sh && lsmr'
--
GitLab