Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Simon Lüdke
dorie
Commits
3de62db0
Commit
3de62db0
authored
Jun 14, 2018
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Dockerfiles now take DUNE env image as argument"
This reverts commit
ab886d7b
.
parent
ab886d7b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
26 deletions
+16
-26
.gitlab-ci.yml
.gitlab-ci.yml
+5
-13
docker/dorie.dockerfile
docker/dorie.dockerfile
+1
-2
docker/dune-env-update.dockerfile
docker/dune-env-update.dockerfile
+1
-2
docker/dune-env.dockerfile
docker/dune-env.dockerfile
+9
-9
No files found.
.gitlab-ci.yml
View file @
3de62db0
...
...
@@ -6,7 +6,7 @@ variables:
DOCKER_LOGIN
:
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
DUNE_ENV_IMAGE
:
dorie/dune-env:2.
6
dorie/dune-env:2.
5.1
CMAKE_FLAGS
:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
...
...
@@ -39,9 +39,7 @@ setup:dune-env:
before_script
:
-
$DOCKER_LOGIN
script
:
-
docker build -f docker/dune-env.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
-
docker build -f docker/dune-env.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
-
docker push $DUNE_ENV_IMAGE
prep:update-dune:
...
...
@@ -59,9 +57,7 @@ prep:update-dune:
before_script
:
-
$DOCKER_LOGIN
script
:
-
docker build -f docker/dune-env-update.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
-
docker build -f docker/dune-env-update.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
-
docker push $DUNE_ENV_IMAGE
build:main:
...
...
@@ -176,9 +172,7 @@ deploy:dockerhub-devel:
before_script
:
-
$DOCKER_LOGIN
script
:
-
docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t dorie/dorie:devel .
-
docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:devel .
-
docker push dorie/dorie:devel
deploy:dockerhub-stable:
...
...
@@ -195,7 +189,5 @@ deploy:dockerhub-stable:
before_script
:
-
$DOCKER_LOGIN
script
:
-
docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE PROCNUM=$CPUS_DIND
-t dorie/dorie:$CI_COMMIT_TAG .
-
docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:$CI_COMMIT_TAG .
-
docker push dorie/dorie:$CI_COMMIT_TAG
docker/dorie.dockerfile
View file @
3de62db0
ARG
DUNE_ENV_IMAGE=dorie/dune-env
FROM
$DUNE_ENV_IMAGE
FROM
dorie/dune-env:2.5.1
LABEL
maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG
PROCNUM=1
...
...
docker/dune-env-update.dockerfile
View file @
3de62db0
ARG
DUNE_ENV_IMAGE=dorie/dune-env
FROM
$DUNE_ENV_IMAGE
FROM
dorie/dune-env:2.5.1
LABEL
maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG
PROCNUM=1
...
...
docker/dune-env.dockerfile
View file @
3de62db0
...
...
@@ -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.
6
\
RUN
git clone https://gitlab.dune-project.org/staging/dune-uggrid.git
-b
releases/2.
5
\
&&
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.
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/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/quality/dune-testtools.git
-b
master
WORKDIR
/opt/dune
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment