Skip to content
Snippets Groups Projects
Commit 3054625a authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Merge branch 'update-phusion-baseimage' into 'master'

update phusion base image to 18.04

See merge request !2220
parents 7887279f f4c4c298
No related branches found
No related tags found
1 merge request!2220update phusion base image to 18.04
...@@ -215,7 +215,7 @@ cat <<EOT >> Dockerfile ...@@ -215,7 +215,7 @@ cat <<EOT >> Dockerfile
# $MODULE_NAME docker container # $MODULE_NAME docker container
# see https://github.com/phusion/baseimage-docker for information on the base image # see https://github.com/phusion/baseimage-docker for information on the base image
# It is Ubuntu LTS customized for better Docker compatibility # It is Ubuntu LTS customized for better Docker compatibility
FROM phusion/baseimage:0.9.22 FROM phusion/baseimage:18.04-1.0.0
MAINTAINER $MODULE_MAINTAINER MAINTAINER $MODULE_MAINTAINER
# run Ubuntu update as advised on https://github.com/phusion/baseimage-docker # run Ubuntu update as advised on https://github.com/phusion/baseimage-docker
...@@ -257,10 +257,6 @@ RUN useradd -m --home-dir /dumux dumux \\ ...@@ -257,10 +257,6 @@ RUN useradd -m --home-dir /dumux dumux \\
&& chmod +x /etc/my_init.d/setpermissions.sh \\ && chmod +x /etc/my_init.d/setpermissions.sh \\
&& usermod -a -G video dumux && usermod -a -G video dumux
# Turn off verbose syslog messages as described here:
# https://github.com/phusion/baseimage-docker/issues/186
RUN touch /etc/service/syslog-forwarder/down
# copy the extracted dumux-pub module and make dumux own it # copy the extracted dumux-pub module and make dumux own it
COPY . /dumux/$MODULE_NAME COPY . /dumux/$MODULE_NAME
RUN chown -R dumux:dumux /dumux/$MODULE_NAME RUN chown -R dumux:dumux /dumux/$MODULE_NAME
...@@ -281,7 +277,7 @@ COPY $INSTALL_DEP_SCRIPT /dumux/$INSTALL_DEP_SCRIPT ...@@ -281,7 +277,7 @@ COPY $INSTALL_DEP_SCRIPT /dumux/$INSTALL_DEP_SCRIPT
RUN ./$INSTALL_DEP_SCRIPT && rm -f /dumux/$INSTALL_DEP_SCRIPT 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/cmake.opts all
# build doxygen documentation and tests # build doxygen documentation and tests
# all applications that use dune_add_test will be built like this # all applications that use dune_add_test will be built like this
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment