From 04c758b5e1fe8ff65ee7bfb50fa392f3818a79e2 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 30 Apr 2025 17:04:03 +0000 Subject: [PATCH 1/4] chore(docker): add common project name for compose With this, different `git worktrees` run under the same project name. --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fe914b2..067cce1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,6 @@ --- +name: ${EX_TRAINER_PROJECT_NAME:-ex_trainer} + services: db: image: 'postgres:17.4-alpine' -- 2.47.2 From 9f51d95e0a969fcf9291bb199974a844ad555f32 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 30 Apr 2025 17:05:22 +0000 Subject: [PATCH 2/4] chore(docker): separate services in compose --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 067cce1..3ccdb86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: - './priv/docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql' - 'db_data:/var/lib/postgresql/data' restart: unless-stopped + app: image: 'joaodubas/ex_trainer:${EX_TRAINER_TAG:-dev}' build: @@ -56,6 +57,7 @@ services: scale: 3 entrypoint: ./priv/docker/service/docker-entrypoint.sh command: local-cookie + test: image: 'joaodubas/ex_trainer:test' build: -- 2.47.2 From 10842836a244151a4d639dc7560e9a137a891053 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 30 Apr 2025 17:05:59 +0000 Subject: [PATCH 3/4] chore(docker): simplify development rules * when `mix.lock` is changed, rebuild the image * when any other file is changed, sync and restart the service * except for directories that are related to deps/build/test/lsp --- docker-compose.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3ccdb86..98cc027 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,23 +29,17 @@ services: init: true develop: watch: + - path: ./mix.lock + action: rebuild - path: ./ ignore: - ./build/ - ./deps/ - target: /opt/app - action: sync - - path: ./config/ + - ./.elixir_ls/ + - ./cover/ + - ./report/ target: /opt/app action: sync+restart - - path: ./lib/wabanex/application.ex - target: /opt/app - action: sync+restart - - path: ./mix.exs - target: /opt/app - action: sync+restart - - path: ./mix.lock - action: rebuild environment: DNS_CLUSTER_QUERY: *app_host POSTGRES_HOST: *db_host -- 2.47.2 From 8ed044af2e6a96bc6fdf0a6ddf772986aea3afad Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 30 Apr 2025 17:11:04 +0000 Subject: [PATCH 4/4] chore(make): use raw `docker compose` command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e54935a..e6a4f12 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DEFAULT_GOAL := help -COMPOSE = docker compose -f docker-compose.yml -f docker-compose.override.yml +COMPOSE = docker compose .PHONY: system_setup system_setup: ## setup system deps -- 2.47.2