Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
fdbf709a
Commit
fdbf709a
authored
6 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
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
!87
Lsmr epic
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/LSMR/docker/lsmr/Dockerfile
+2
-3
2 additions, 3 deletions
SAS/LSMR/docker/lsmr/Dockerfile
with
2 additions
and
3 deletions
SAS/LSMR/docker/lsmr/Dockerfile
+
2
−
3
View file @
fdbf709a
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment