From 26211f3a2da94d388ad7729f9fd7a7bd88b4013f Mon Sep 17 00:00:00 2001
From: Nik Afiq <nik.afiq98@ymail.com>
Date: Thu, 5 Mar 2026 20:58:49 +0900
Subject: [PATCH] Refactor Makefile to use variable for docker compose command
 and add docker-compose.yml for spanner services

---
 Makefile                                        | 14 ++++++++------
 docker-compose.yml => docker/docker-compose.yml |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (83%)

diff --git a/Makefile b/Makefile
index 1dddaf7..fd610e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,24 @@
 .PHONY: up down down-volume logs ps
 
+COMPOSE = docker compose -f docker/docker-compose.yml
+
 up:
-	docker compose up -d spanner
+	$(COMPOSE) up -d spanner
 
 init:
-	docker compose up -d spanner-init
+	$(COMPOSE) up -d spanner-init
 
 down:
-	docker compose down
+	$(COMPOSE) down
 
 down-volume:
-	docker compose down -v
+	$(COMPOSE) down -v
 
 ps:
-	docker compose ps
+	$(COMPOSE) ps
 
 logs:
-	docker compose logs -f
+	$(COMPOSE) logs -f
 
 server:
 	go -C api run ./cmd/server
\ No newline at end of file
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 83%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 6d24dd1..8652a4a 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,12 +12,12 @@ services:
     depends_on:
       - spanner
     env_file:
-      - .env
+      - ../.env
     environment:
       # Tell gcloud/client libs to talk to the emulator inside the network
       - SPANNER_EMULATOR_HOST=spanner:9010
     volumes:
-      - ./scripts/spanner-init.sh:/work/spanner-init.sh:ro
-      - ./ddl:/work/ddl:ro
+      - ../scripts/spanner-init.sh:/work/spanner-init.sh:ro
+      - ../ddl:/work/ddl:ro
     working_dir: /work
     entrypoint: [ "bash", "/work/spanner-init.sh" ]
\ No newline at end of file