diff --git a/SAS/LSMR/docker/lsmr/Dockerfile b/SAS/LSMR/docker/lsmr/Dockerfile index 370020f277adabd3690665b8ae2690cbf8aefa9d..a42a6a1185f77946b794dc8f288486614e983df6 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'