...
 
Commits (2)
......@@ -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-mod:2.5.2
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
......@@ -19,46 +19,8 @@ before_script:
- cd /opt/dune
stages:
- setup
- prep
- build
- test
- deploy
setup:dune-env:
stage: setup
only:
- web # activate through 'Run pipeline' only.
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
prep:update-dune:
stage: prep
only:
- master
- tags
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env-update -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
build:main:
stage: build
......@@ -157,37 +119,3 @@ test:mass_conserve:
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 day
deploy:dockerhub-devel:
stage: deploy
only:
- master@dorie/dorie
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:devel .
- docker push dorie/dorie:devel
deploy:dockerhub-stable:
stage: deploy
only:
- tags@dorie/dorie
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
......@@ -7,5 +7,5 @@ Module: dorie
Version: 0.9
Maintainer: dorieteam@iup.uni-heidelberg.de
#depending on
Depends: dune-pdelab dune-uggrid dune-randomfield
Depends: dune-pdelab dune-uggrid dune-randomfield dune-modelling
Suggests: dune-testtools
\ No newline at end of file