diff --git a/scripts/Common/Software/docker/services/docker-compose.yml b/scripts/Common/Software/docker/services/docker-compose.yml index 2e1ecd19..3c12ec01 100644 --- a/scripts/Common/Software/docker/services/docker-compose.yml +++ b/scripts/Common/Software/docker/services/docker-compose.yml @@ -2,3 +2,4 @@ include: - path: - docker-compose.base.yml - docker-compose.secrets.yml + - docker-compose.overrides.yml diff --git a/scripts/Common/Software/docker/services/service.fish b/scripts/Common/Software/docker/services/service.fish index 365b36cd..e01a6678 100644 --- a/scripts/Common/Software/docker/services/service.fish +++ b/scripts/Common/Software/docker/services/service.fish @@ -116,6 +116,7 @@ begin sudo mkdir -p (getServiceRoot $argv) sudo mkdir -p "$nginxRoot" sudo mkdir -p (dirname (getServiceSecretsConfig $argv)) + sudo touch "$root/docker-compose.overrides.yml" sudo cp "$dir/docker-compose.yml" "$root" end @@ -183,6 +184,6 @@ begin set extraPatterns "|$extraPatterns" end - printf "%s\n" --base-directory (getServiceRoot $argv) --hidden --no-ignore "^(docker-compose\.secrets\.yml|data)\$$extraPatterns" + printf "%s\n" --base-directory (getServiceRoot $argv) --hidden --no-ignore "^(docker-compose\.(secrets|overrides)\.yml|data)\$$extraPatterns" end end