Skip to content
Snippets Groups Projects
Commit fdbf709a authored by Jan David Mol's avatar Jan David Mol
Browse files

Task LSMR-102: Remove superfluous hotpatch, lingering use of fixed LSMR-epic branch

parent 4996ad04
No related branches found
No related tags found
1 merge request!87Lsmr epic
...@@ -19,9 +19,9 @@ RUN apt-get -y install python3-pip && pip3 install django djangorestframework dj ...@@ -19,9 +19,9 @@ RUN apt-get -y install python3-pip && pip3 install django djangorestframework dj
RUN mkdir /src && \ RUN mkdir /src && \
cd /src && \ cd /src && \
svn co -N https://svn.astron.nl/LOFAR/branches/$BRANCH/ && \ svn co -N https://svn.astron.nl/LOFAR/branches/$BRANCH/ && \
cd LSMR-epic && \ cd $BRANCH/ && \
svn up CMake 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 # Configure authentication
ADD dbcreds.ini /opt/lofar/etc/dbcredentials/lsmr.ini ADD dbcreds.ini /opt/lofar/etc/dbcredentials/lsmr.ini
...@@ -33,7 +33,6 @@ EXPOSE 8000 ...@@ -33,7 +33,6 @@ EXPOSE 8000
RUN echo "ALLOWED_HOSTS=['*']" >> /opt/lofar/lib/python3.6/site-packages/lofar/sas/lsmr/lsmr/settings.py RUN echo "ALLOWED_HOSTS=['*']" >> /opt/lofar/lib/python3.6/site-packages/lofar/sas/lsmr/lsmr/settings.py
# Hot patches # Hot patches
RUN sed -i "s/PASS/PASSWORD/" /opt/lofar/lib/python3.6/site-packages/lofar/sas/lsmr/lsmr/settings.py
# Run LOFAR app # Run LOFAR app
CMD bash -c 'source /opt/lofar/lofarinit.sh && lsmr' CMD bash -c 'source /opt/lofar/lofarinit.sh && lsmr'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment