Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LINC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
ResearchAndDevelopment
LINC
Commits
32c9df45
Commit
32c9df45
authored
4 years ago
by
Mattia Mancini
Browse files
Options
Downloads
Patches
Plain Diff
Update dockerfiles
Former-commit-id:
9d81a7c9
Former-commit-id:
e1352fbc
parent
65d1e0ac
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Docker/Dockerfile
+4
-2
4 additions, 2 deletions
Docker/Dockerfile
Docker/build_docker.sh
+2
-2
2 additions, 2 deletions
Docker/build_docker.sh
with
6 additions
and
4 deletions
Docker/Dockerfile
+
4
−
2
View file @
32c9df45
...
@@ -3,8 +3,10 @@ USER root
...
@@ -3,8 +3,10 @@ USER root
COPY
prefactor/scripts/* /opt/lofar/scripts/
COPY
prefactor/scripts/* /opt/lofar/scripts/
COPY
prefactor/skymodels/* /data/skymodels/
COPY
prefactor/skymodels/* /data/skymodels/
COPY
prefactor/rfistrategies/* /data/rfistrategies/
COPY
prefactor/rfistrategies/* /data/rfistrategies/
COPY
prefactor/solutions/ /data/solutions/*
COPY
prefactor/solutions/* /data/solutions/
RUN
apt update
&&
apt
install
-y
vim
COPY
lofar /lofar/src
RUN
apt update
&&
apt
install
-y
vim
RUN
pip3
install
--upgrade
pip
&&
pip3
install
--upgrade
numpy scipy
RUN
pip3
install
--upgrade
pip
&&
pip3
install
--upgrade
numpy scipy
RUN
ln
-sf
/opt/lofar/scripts/
*
/usr/local/bin/
RUN
ln
-sf
/opt/lofar/scripts/
*
/usr/local/bin/
...
...
This diff is collapsed.
Click to expand it.
Docker/build_docker.sh
+
2
−
2
View file @
32c9df45
...
@@ -14,14 +14,14 @@ git_clone_or_pull () {
...
@@ -14,14 +14,14 @@ git_clone_or_pull () {
}
}
Prefactor_TAG
=
production
Prefactor_TAG
=
production
LOFAR_TAG
=
LOFAR-Release-4_0_17
# FETCHES Prefactor
# FETCHES Prefactor
git_clone_or_pull https://github.com/lofar-astron/prefactor.git
${
Prefactor_TAG
}
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]
}
)
SCRIPT_PATH
=
$(
realpath
${
BASH_SOURCE
[0]
}
)
DOCKER_PATH
=
$(
dirname
${
SCRIPT_PATH
}
)
DOCKER_PATH
=
$(
dirname
${
SCRIPT_PATH
}
)
docker build
${
DOCKER_PATH
}
-t
lofareosc/prefactor
docker build
${
DOCKER_PATH
}
-t
lofareosc/prefactor
docker build
${
DOCKER_PATH
}
-f
${
DOCKER_PATH
}
/Dockerfile_ci
-t
lofareosc/prefactor-ci
docker build
${
DOCKER_PATH
}
-f
${
DOCKER_PATH
}
/Dockerfile_ci
-t
lofareosc/prefactor-ci
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