From f90b8301bd7b66b4a41c1e2da78fe0e1cae797f7 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 2 Feb 2025 01:01:01 +0100 Subject: [PATCH] Simplify docker-compose include Signed-off-by: Bensuperpc --- .gitmodules | 4 ++-- infrastructure/docker-compose.yml | 12 +++--------- .../services/{7daystodie => 7daystodie-server} | 0 .../services/{satisfactory => satisfactory-server} | 0 4 files changed, 5 insertions(+), 11 deletions(-) rename infrastructure/services/{7daystodie => 7daystodie-server} (100%) rename infrastructure/services/{satisfactory => satisfactory-server} (100%) diff --git a/.gitmodules b/.gitmodules index d4e7e89..bf4ac7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,8 @@ path = infrastructure/services/minecraft-server url = git@github.com:bensuperpc/docker-minecraft-server.git [submodule "infrastructure/services/7daystodie"] - path = infrastructure/services/7daystodie + path = infrastructure/services/7daystodie-server url = git@github.com:bensuperpc/docker-7daystodie.git [submodule "infrastructure/services/satisfactory"] - path = infrastructure/services/satisfactory + path = infrastructure/services/satisfactory-server url = git@github.com:bensuperpc/docker-satisfactory.git diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index 1b8818a..6ca0c76 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -40,14 +40,8 @@ include: # open-webui - services/open-webui/docker-compose.open-webui.yml # Minecraft - - services/minecraft-server/minecraft-server/minecraft-server/docker-compose.yml -# Backup minecraft - - services/minecraft-server/minecraft-server/backup/docker-compose.backup.yml + - services/minecraft-server/minecraft-server/docker-compose.yml # 7daystodie - - services/7daystodie/7daystodie-server/7daystodie/docker-compose.7daystodie.yml -# Backup 7daystodie - - services/7daystodie/7daystodie-server/backup/docker-compose.backup.yml + - services/7daystodie-server/7daystodie-server/docker-compose.yml # Satisfactory - - services/satisfactory/satisfactory-server/satisfactory/docker-compose.satisfactory.yml -# Backup satisfactory - - services/satisfactory/satisfactory-server/backup/docker-compose.backup.yml + - services/satisfactory-server/satisfactory-server/docker-compose.yml diff --git a/infrastructure/services/7daystodie b/infrastructure/services/7daystodie-server similarity index 100% rename from infrastructure/services/7daystodie rename to infrastructure/services/7daystodie-server diff --git a/infrastructure/services/satisfactory b/infrastructure/services/satisfactory-server similarity index 100% rename from infrastructure/services/satisfactory rename to infrastructure/services/satisfactory-server