From b2a75ab5ad46f7af4d8d6727e1489970a8da0bb4 Mon Sep 17 00:00:00 2001 From: HTWKalender Team Date: Tue, 16 Jul 2024 09:43:14 -0400 Subject: [PATCH 1/7] Add submodules --- .gitmodules | 6 ++++++ codeocean | 1 + poseidon | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitmodules create mode 160000 codeocean create mode 160000 poseidon diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1c7e8b5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "codeocean"] + path = codeocean + url = https://htwkmooc@gitlab.dit.htwk-leipzig.de/htwkmooc/codeocean.git +[submodule "poseidon"] + path = poseidon + url = https://htwkmooc@gitlab.dit.htwk-leipzig.de/htwkmooc/poseidon.git diff --git a/codeocean b/codeocean new file mode 160000 index 0000000..eead6e8 --- /dev/null +++ b/codeocean @@ -0,0 +1 @@ +Subproject commit eead6e891454897d5a4cb92b6ae2140185452b96 diff --git a/poseidon b/poseidon new file mode 160000 index 0000000..1dace08 --- /dev/null +++ b/poseidon @@ -0,0 +1 @@ +Subproject commit 1dace08128365524df68947bd99b28b1db219ada From eb250c2178a781218540e11168732956bf5080da Mon Sep 17 00:00:00 2001 From: HTWKalender Team Date: Tue, 16 Jul 2024 14:58:00 -0400 Subject: [PATCH 2/7] Docker compose file to combine subrepose, Poseidon not linked yet --- .gitignore | 1 + codeocean | 2 +- docker-compose.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ poseidon | 2 +- 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..722d5e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode diff --git a/codeocean b/codeocean index eead6e8..3895537 160000 --- a/codeocean +++ b/codeocean @@ -1 +1 @@ -Subproject commit eead6e891454897d5a4cb92b6ae2140185452b96 +Subproject commit 3895537f4fe2da7733ba5deaf1316cdfb0e2710b diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2acf677 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +version: "3" + +networks: + codeocean: + driver: bridge + external: false + +services: + codeocean-db: + extends: + file: codeocean/docker-compose.yml + service: codeocean-db + networks: + - codeocean + codeocean: + extends: + file: codeocean/docker-compose.yml + service: codeocean + environment: + POSEIDON_HOST: poseidon:7200 + networks: + - codeocean + prometheus: + extends: + file: codeocean/docker-compose.yml + service: prometheus + networks: + - codeocean + nginx: + extends: + file: codeocean/docker-compose.yml + service: nginx + networks: + - codeocean + poseidon: + extends: + file: poseidon/docker-compose.yml + service: poseidon + networks: + - codeocean + +volumes: + db_data: + config: diff --git a/poseidon b/poseidon index 1dace08..8e039c4 160000 --- a/poseidon +++ b/poseidon @@ -1 +1 @@ -Subproject commit 1dace08128365524df68947bd99b28b1db219ada +Subproject commit 8e039c4ecb8f20612ba1969d6426b7457e2dd389 From a2d4530c3d12555ffa7498646764177bc291f73b Mon Sep 17 00:00:00 2001 From: HTWKalender Team Date: Thu, 8 Aug 2024 11:07:12 -0400 Subject: [PATCH 3/7] fix nomad with docker host gateway in poseidon --- docker-compose.yml | 4 +--- poseidon | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2acf677..3d428e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,8 @@ -version: "3" - networks: codeocean: driver: bridge external: false - + services: codeocean-db: extends: diff --git a/poseidon b/poseidon index 8e039c4..f9a6ba8 160000 --- a/poseidon +++ b/poseidon @@ -1 +1 @@ -Subproject commit 8e039c4ecb8f20612ba1969d6426b7457e2dd389 +Subproject commit f9a6ba8f1cc7c25a193de13bca16d9ee145835ab From 87d4eebb609e60b8686c68403728c6e0458b0d2c Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Fri, 9 Aug 2024 19:26:36 +0200 Subject: [PATCH 4/7] added new submodule polyphem --- polyphem | 1 + 1 file changed, 1 insertion(+) create mode 160000 polyphem diff --git a/polyphem b/polyphem new file mode 160000 index 0000000..5376f7a --- /dev/null +++ b/polyphem @@ -0,0 +1 @@ +Subproject commit 5376f7a027216cb2350ca0e34f1bea48d409a85c From a7087e84defecf916547886c97ea95e4b5d50924 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Fri, 9 Aug 2024 19:26:46 +0200 Subject: [PATCH 5/7] updated gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 722d5e7..8cd0df3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .vscode +.idea \ No newline at end of file From 2d2d72a7ebc9972dbedd8a578badbec2d160714a Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Mon, 12 Aug 2024 10:08:52 +0200 Subject: [PATCH 6/7] added polyphem --- polyphem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polyphem b/polyphem index 5376f7a..254460d 160000 --- a/polyphem +++ b/polyphem @@ -1 +1 @@ -Subproject commit 5376f7a027216cb2350ca0e34f1bea48d409a85c +Subproject commit 254460d64c648b5ac328381f9e73bef0e21212ae From 13b4978530b23f622844358dd61e348ea855c1f5 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Wed, 18 Sep 2024 07:26:33 -0400 Subject: [PATCH 7/7] updated submodules --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 1c7e8b5..a9171d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "poseidon"] path = poseidon url = https://htwkmooc@gitlab.dit.htwk-leipzig.de/htwkmooc/poseidon.git +[submodule "polyphem"] + path = polyphem + url = https://gitlab.dit.htwk-leipzig.de/htwkmooc/polyphem.git