Commit 33b853d5 authored by Lukas Riedel's avatar Lukas Riedel

Revert "Revert "Dockerfiles now take DUNE env image as argument""

This reverts commit 3de62db0.
parent 0ddadbab
......@@ -6,7 +6,7 @@ variables:
DOCKER_LOGIN:
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
DUNE_ENV_IMAGE:
dorie/dune-env:2.5.1
dorie/dune-env:2.6
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
......@@ -39,7 +39,9 @@ setup:dune-env:
before_script:
- $DOCKER_LOGIN
script:
- docker build -f docker/dune-env.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
prep:update-dune:
......@@ -57,7 +59,9 @@ prep:update-dune:
before_script:
- $DOCKER_LOGIN
script:
- docker build -f docker/dune-env-update.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env-update.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
build:main:
......@@ -172,7 +176,9 @@ deploy:dockerhub-devel:
before_script:
- $DOCKER_LOGIN
script:
- docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:devel .
- docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t dorie/dorie:devel .
- docker push dorie/dorie:devel
deploy:dockerhub-stable:
......@@ -189,5 +195,7 @@ deploy:dockerhub-stable:
before_script:
- $DOCKER_LOGIN
script:
- docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:$CI_COMMIT_TAG .
- docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
FROM dorie/dune-env:2.5.1
ARG DUNE_ENV_IMAGE=dorie/dune-env
FROM $DUNE_ENV_IMAGE
LABEL maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG PROCNUM=1
......
FROM dorie/dune-env:2.5.1
ARG DUNE_ENV_IMAGE=dorie/dune-env
FROM $DUNE_ENV_IMAGE
LABEL maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG PROCNUM=1
......
......@@ -31,16 +31,16 @@ RUN rm -rf /var/lib/apt/lists/* \
ENV LANG en_US.utf8
WORKDIR /opt/dune
RUN git clone https://gitlab.dune-project.org/staging/dune-uggrid.git -b releases/2.5 \
RUN git clone https://gitlab.dune-project.org/staging/dune-uggrid.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/oklein/dune-randomfield.git -b master \
&& git clone https://gitlab.dune-project.org/core/dune-common.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-geometry.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-grid.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-istl.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-localfunctions.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/staging/dune-functions.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/pdelab/dune-pdelab.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/staging/dune-typetree.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-common.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-geometry.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-grid.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-istl.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-localfunctions.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/staging/dune-functions.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/pdelab/dune-pdelab.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/staging/dune-typetree.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/quality/dune-testtools.git -b master
WORKDIR /opt/dune
......
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