Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Ansgar Burchardt
dune-docker
Commits
148ee17a
Commit
148ee17a
authored
Jan 29, 2016
by
Ansgar Burchardt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'gitlab-ci/master'
parents
33e4156b
aec27362
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
Makefile
Makefile
+4
-4
dune-git/Dockerfile
dune-git/Dockerfile
+7
-1
No files found.
Makefile
View file @
148ee17a
...
...
@@ -4,11 +4,11 @@ clean:
rm
-f
--
./
*
-stamp
base-8-stamp
:
base-8/Dockerfile
docker build
-t
duneci/base:8 base-8
docker build
--no-cache
-t
duneci/base:8 base-8
touch
$@
base-9-stamp
:
base-9/Dockerfile
docker build
-t
duneci/base:9 base-9
docker build
--no-cache
-t
duneci/base:9 base-9
touch
$@
dune-2.3-stamp
:
base-8-stamp dune-2.3/Dockerfile
...
...
@@ -24,8 +24,8 @@ dune-fufem-stamp: dune-fufem/Dockerfile dune-2.4-stamp
touch
$@
dune-git-stamp
:
base-9-stamp dune-git/Dockerfile
docker build
-t
duneci/dune:git-staging dune-git
docker run
-i
duneci/dune:git-staging sh
-c
"dunecontrol make build_tests && dunecontrol make test"
docker build
--no-cache
-t
duneci/dune:git-staging dune-git
#
docker run -i duneci/dune:git-staging sh -c "dunecontrol make build_tests && dunecontrol make test"
docker tag
-f
duneci/dune:git-staging duneci/dune:git
touch
$@
...
...
dune-git/Dockerfile
View file @
148ee17a
...
...
@@ -2,7 +2,13 @@ FROM duneci/base:9
USER
root
WORKDIR
/
RUN
apt-get
install
--no-install-recommends
--yes
libug-dev
RUN
apt-get
install
--no-install-recommends
--yes
\
gnuplot-nox
\
libscotchmetis-dev
\
libug-dev
\
locales-all
\
python-vtk6
\
&&
apt-get clean
USER
duneci
WORKDIR
/duneci
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment