From e9f91d9f0a879afc4465fd029d28a58bed477b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Milk?= <rene.milk@wwu.de>
Date: Wed, 10 Oct 2018 23:19:35 +0200
Subject: [PATCH] [ci] add Dockerfile
---
.ci/docker/Dockerfile | 7 +++
.gitsuper | 102 +++++++++++++++++-------------------------
2 files changed, 49 insertions(+), 60 deletions(-)
create mode 100644 .ci/docker/Dockerfile
diff --git a/.ci/docker/Dockerfile b/.ci/docker/Dockerfile
new file mode 100644
index 000000000..f01cb4620
--- /dev/null
+++ b/.ci/docker/Dockerfile
@@ -0,0 +1,7 @@
+ARG BASE
+FROM dunecommunity/$BASE
+
+ADD . ${SUPERDIR}/${MY_MODULE}/
+RUN cd ${SUPERDIR} && \
+ echo ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} all && \
+ ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} all
diff --git a/.gitsuper b/.gitsuper
index 442358bb7..c04a74604 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,38 +1,35 @@
[supermodule]
-remote = https://github.com/dune-community/pylrbms-super
+remote = git@github.com:dune-community/dune-xt-super.git
status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
- 5af7224dda0addd6cde1a0073ff93fc9be1f5095 config.opts (heads/master)
+ 81cfc08e7f7e78f7a7cd91ce22b88322fbb98c58 config.opts (remotes/origin/HEAD)
8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +f2259228346aba170ecc5078414c3ea7859ed02c dune-gdt (heads/renemilk/work)
- 6bd2463d53617b8c0c0f11a485277a32e9c8e98a dune-geometry (v2.5.2)
+ e6350271b8d014adab51467a35b6ad8ef48212a0 dune-geometry (v2.5.1-6-ge635027)
d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33)
- 583ad7009ff4de9c6905076ec7ed179c93468957 dune-istl (v2.5.1-1-g583ad700)
- 9f7ceb11b920a4157d744537e4cf1c2ea27c4fd2 dune-localfunctions (v2.5.1-2-g9f7ceb1)
+ 63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
+ 0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
- 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (heads/dune_xt)
+ 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (26cc8cb)
8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
- +e4eefbdd13cb91f19e84c2bd3cce9b716ca86a68 dune-xt-common (heads/dbg_assert)
- b8cf8efc32e46511990b691afee55da3b7af15c8 dune-xt-data (heads/master)
- +a8cb52b2ce0f23a2918278e7e58ba5cefe915668 dune-xt-functions (heads/cmake_format)
- dd30fcd7d4485eb2a8158d5ddf01333f58502c40 dune-xt-grid (heads/master)
- fab7ebec48ebafb5cf541ea3ff696955b480a768 dune-xt-la (heads/master)
- +b1f1eed91687f9b468097dd4cad896c5c4222cb3 pylrbms (heads/master)
- 37f7861dd9b8fd00cc28fc6c80d2b005567e8a0d pymor (0.1.0-3239-g37f7861d)
- 60cd896bf3f1eb99066563aa1a07113e5a791d47 scripts (heads/master)
-commit = 23e61dc799f19ee8902b547a4002be6bea6e4082
+ +fe2ba758c4a4b11181841411d743db42b583ec04 dune-xt-common (heads/python_ci)
+ +24ef72265b35974dd70321a827290a6440db9ec9 dune-xt-data (heads/python_ci)
+ +83b29cbe84d0af6579d6904f59598ad3dd132996 dune-xt-functions (heads/master)
+ +d4d2b463a75b557fdec45069c1f43b20b40b6265 dune-xt-grid (heads/master)
+ +0b70e09006fed109e6b1a1be0bf8ab28e1773c98 dune-xt-la (heads/python_ci)
+ 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
+commit = 5b6faba429f85b51305b2fff490df68b7edb097d
[submodule.bin]
-remote = https://github.com/dune-community/local-bin.git
+remote = git@github.com:dune-community/local-bin.git
status =
commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
[submodule.config.opts]
-remote = https://github.com/dune-community/config.opts.git
+remote = git@github.com:dune-community/config.opts.git
status =
-commit = 5af7224dda0addd6cde1a0073ff93fc9be1f5095
+commit = 81cfc08e7f7e78f7a7cd91ce22b88322fbb98c58
[submodule.dune-alugrid]
remote = https://github.com/dune-mirrors/dune-alugrid.git
@@ -40,22 +37,17 @@ status =
commit = 8f2c5aba441417bf2c42f22272f538c68a89cc4a
[submodule.dune-common]
-remote = https://github.com/dune-community/dune-common.git
+remote = git@github.com:dune-community/dune-common.git
status =
commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
-[submodule.dune-gdt]
-remote = https://github.com/dune-community/dune-gdt.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = f2259228346aba170ecc5078414c3ea7859ed02c
-
[submodule.dune-geometry]
-remote = https://github.com/dune-mirrors/dune-geometry.git
+remote = http://github.com/dune-community/dune-geometry.git
status =
-commit = 6bd2463d53617b8c0c0f11a485277a32e9c8e98a
+commit = e6350271b8d014adab51467a35b6ad8ef48212a0
[submodule.dune-grid]
-remote = https://github.com/dune-community/dune-grid.git
+remote = http://github.com/dune-community/dune-grid.git
status =
commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e
@@ -65,17 +57,17 @@ status =
commit = e9d9a3336735090648637e044e279866bbea3597
[submodule.dune-istl]
-remote = https://github.com/dune-mirrors/dune-istl.git
+remote = http://github.com/dune-mirrors/dune-istl.git
status =
-commit = 583ad7009ff4de9c6905076ec7ed179c93468957
+commit = 63df56a54f81eda308233a683eb329e77e69f0a9
[submodule.dune-localfunctions]
-remote = https://github.com/dune-community/dune-localfunctions.git
+remote = http://github.com/dune-mirrors/dune-localfunctions.git
status =
-commit = 9f7ceb11b920a4157d744537e4cf1c2ea27c4fd2
+commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116
[submodule.dune-pybindxi]
-remote = https://github.com/dune-community/dune-pybindxi.git
+remote = git@github.com:dune-community/dune-pybindxi.git
status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
commit = 8a69fc68165780921bbba77da338b6932daf983c
@@ -85,7 +77,7 @@ status =
commit = 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c
[submodule.dune-testtools]
-remote = https://github.com/dune-community/dune-testtools.git
+remote = https://github.com/dune-mirrors/dune-testtools.git
status =
commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79
@@ -95,42 +87,32 @@ status =
commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9
[submodule.dune-xt-common]
-remote = https://github.com/dune-community/dune-xt-common.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = e4eefbdd13cb91f19e84c2bd3cce9b716ca86a68
+remote = git@github.com:dune-community/dune-xt-common.git
+status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (remotes/origin/HEAD)
+commit = fe2ba758c4a4b11181841411d743db42b583ec04
[submodule.dune-xt-data]
remote = https://github.com/dune-community/dune-xt-data
-status = -2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup
-commit = b8cf8efc32e46511990b691afee55da3b7af15c8
+status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
+commit = 24ef72265b35974dd70321a827290a6440db9ec9
[submodule.dune-xt-functions]
-remote = https://github.com/dune-community/dune-xt-functions.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = a8cb52b2ce0f23a2918278e7e58ba5cefe915668
+remote = git@github.com:dune-community/dune-xt-functions.git
+status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (remotes/origin/HEAD)
+commit = 83b29cbe84d0af6579d6904f59598ad3dd132996
[submodule.dune-xt-grid]
-remote = https://github.com/dune-community/dune-xt-grid.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = dd30fcd7d4485eb2a8158d5ddf01333f58502c40
+remote = git@github.com:dune-community/dune-xt-grid.git
+status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (remotes/origin/HEAD)
+commit = d4d2b463a75b557fdec45069c1f43b20b40b6265
[submodule.dune-xt-la]
-remote = https://github.com/dune-community/dune-xt-la.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = fab7ebec48ebafb5cf541ea3ff696955b480a768
-
-[submodule.pylrbms]
-remote = https://github.com/dune-community/pylrbms
-status =
-commit = b1f1eed91687f9b468097dd4cad896c5c4222cb3
-
-[submodule.pymor]
-remote = https://zivgitlab.uni-muenster.de/srave_01/pymor.git
-status =
-commit = 37f7861dd9b8fd00cc28fc6c80d2b005567e8a0d
+remote = git@github.com:dune-community/dune-xt-la.git
+status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (remotes/origin/HEAD)
+commit = 0b70e09006fed109e6b1a1be0bf8ab28e1773c98
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
-status = -fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense
-commit = 60cd896bf3f1eb99066563aa1a07113e5a791d47
+status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (fb5ebc1)
+commit = 09d0378f616b94d68bcdd9fc6114813181849ec0
--
GitLab