Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
dumux-repositories
dumux
Commits
8e6098ad
Commit
8e6098ad
authored
7 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[docker][util] build tests by default
(cherry picked from commit
97fe21c9
)
parent
33fbac90
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/moduleutil/createdockerimage.sh
+6
-5
6 additions, 5 deletions
bin/moduleutil/createdockerimage.sh
with
6 additions
and
5 deletions
bin/moduleutil/createdockerimage.sh
+
6
−
5
View file @
8e6098ad
...
@@ -41,7 +41,7 @@ chmod +x $INSTALL_DEP_SCRIPT
...
@@ -41,7 +41,7 @@ chmod +x $INSTALL_DEP_SCRIPT
# make a docker folder
# make a docker folder
if
[
-d
docker
]
;
then
if
[
-d
docker
]
;
then
echo
""
echo
""
read
-p
" A docker folder already exists. Continue anyway?
(W
ill be overwritten
)
[y/N] "
DELETE
read
-p
" A docker folder already exists. Continue anyway?
- w
ill be overwritten
-
[y/N] "
DELETE
echo
""
echo
""
if
test
x
$DELETE
=
xy
-o
x
$DELETE
=
xY
;
then
if
test
x
$DELETE
=
xy
-o
x
$DELETE
=
xY
;
then
rm
-r
docker
rm
-r
docker
...
@@ -282,8 +282,9 @@ RUN ./$INSTALL_DEP_SCRIPT && rm -f /dumux/$INSTALL_DEP_SCRIPT
...
@@ -282,8 +282,9 @@ RUN ./$INSTALL_DEP_SCRIPT && rm -f /dumux/$INSTALL_DEP_SCRIPT
# configure module
# configure module
RUN /dumux/dune-common/bin/dunecontrol --opts=/dumux/dumux/optim.opts all
RUN /dumux/dune-common/bin/dunecontrol --opts=/dumux/dumux/optim.opts all
# build doxygen documentation
# build doxygen documentation and tests
RUN cd
$MODULE_NAME
/build-cmake && make doc
# all applications that use dune_add_test will be built like this
RUN cd
$MODULE_NAME
/build-cmake && make doc && make -j4 build_tests
# switch back to root
# switch back to root
USER root
USER root
...
@@ -310,9 +311,9 @@ if test x$BUILD = xy -o x$BUILD = xY; then
...
@@ -310,9 +311,9 @@ if test x$BUILD = xy -o x$BUILD = xY; then
echo
"Successfully built docker image:
$DOCKER_TAG
. Have a look at docker/README.md."
echo
"Successfully built docker image:
$DOCKER_TAG
. Have a look at docker/README.md."
echo
"Check the container running docker run -it
$DOCKER_TAG
/bin/bash "
echo
"Check the container running docker run -it
$DOCKER_TAG
/bin/bash "
echo
"in the same directory as the Dockerfile."
echo
"in the same directory as the Dockerfile."
echo
"And try using the convenience script pubtable_
$DOCKER_TAG
(
see docker/README.md
)
."
echo
"And try using the convenience script pubtable_
$DOCKER_TAG
,
see docker/README.md."
else
else
cd
..
cd
..
echo
"You can build your Docker image later by running docker build -f docker/Dockerfile -t
$DOCKER_TAG
."
echo
"You can build your Docker image later by running docker build -f docker/Dockerfile -t
$DOCKER_TAG
."
echo
"in your module directory
(
i.e. above the docker folder containing Dockerfile
)
."
echo
"in your module directory
,
i.e. above the docker folder containing Dockerfile."
fi
fi
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