build: rename override docker-compose.yml files

AlcidesRC · Sep 11, 2024 · 20b6c43 · 20b6c43
1 parent ffa6b0e
commit 20b6c43
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ HOST_GROUP_NAME := $(shell id --group --name)
 
 #---
 
-DOCKER_COMPOSE         = docker compose --file docker-compose.yml --file docker-compose-$(env).yml
+DOCKER_COMPOSE         = docker compose --file docker-compose.yml --file docker-compose.override.$(env).yml
 
 DOCKER_BUILD_ARGUMENTS = --build-arg="HOST_USER_ID=$(HOST_USER_ID)" --build-arg="HOST_USER_NAME=$(HOST_USER_NAME)" --build-arg="HOST_GROUP_ID=$(HOST_GROUP_ID)" --build-arg="HOST_GROUP_NAME=$(HOST_GROUP_NAME)"
 

diff --git a/docker-compose-dev.yml → docker-compose.override.dev.yml b/docker-compose-dev.yml → docker-compose.override.dev.yml
@@ -1,18 +1,12 @@
 services:
     app:
-        extends:
-            file: docker-compose.yml
-            service: app
         build:
             target: build-development
         image: app:development
         volumes:
             - ./coverage:/coverage
 
     caddy:
-        extends:
-            file: docker-compose.yml
-            service: caddy
         volumes:
             - ./build/dev/Caddyfile:/etc/caddy/Caddyfile:ro
         healthcheck:

diff --git a/docker-compose-prod.yml → docker-compose.override.prod.yml b/docker-compose-prod.yml → docker-compose.override.prod.yml