From eb250c2178a781218540e11168732956bf5080da Mon Sep 17 00:00:00 2001 From: HTWKalender Team Date: Tue, 16 Jul 2024 14:58:00 -0400 Subject: [PATCH] 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