Commit ba10573f authored by Ansgar Burchardt's avatar Ansgar Burchardt

Merge remote-tracking branch 'gitlab-ci/master'

parents 148ee17a 11fb7eac
......@@ -20,7 +20,7 @@ dune-2.4-stamp: base-9-stamp dune-2.4/Dockerfile
touch $@
dune-fufem-stamp: dune-fufem/Dockerfile dune-2.4-stamp
docker build -t duneci/dune-fufem:2.4 dune-fufem
docker build --no-cache -t duneci/dune-fufem:2.4 dune-fufem
touch $@
dune-git-stamp: base-9-stamp dune-git/Dockerfile
......
......@@ -14,6 +14,7 @@ RUN apt-get install --no-install-recommends --yes \
gfortran \
git \
libadolc-dev \
libboost-dev \
libtinyxml2-dev \
libltdl-dev \
libtool \
......
......@@ -14,6 +14,7 @@ RUN apt-get install --no-install-recommends --yes \
gfortran \
git \
libadolc-dev \
libboost-dev \
libtinyxml2-dev \
libltdl-dev \
libtool \
......
......@@ -4,7 +4,7 @@ RUN mkdir -p modules
WORKDIR /duneci/modules
RUN git clone -b releases/2.4-1 https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
RUN git clone -b releases/2.4-compatible https://gitlab.dune-project.org/staging/dune-functions.git
RUN git clone https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
RUN git clone -b releases/2.4-1 https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
RUN git clone -b releases/2.4 https://gitlab.dune-project.org/pdelab/dune-typetree.git
RUN dunecontrol all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment