fix: now use .env.example prior to .env

.devcontainer/devcontainer.json

@@ -18,6 +18,5 @@
       "installGradle": true
     }
   },
-  "forwardPorts": [8080, 5432],
-  "onCreateCommand": "cp .env.example .env"
+  "forwardPorts": [8080, 5432]
 }

Makefile

@@ -1,10 +1,10 @@
 .PHONY: local up down clean localdb
 
 local:
-	docker-compose --env-file .env -f docker-compose.yml -f docker-compose.local.yml build --no-cache
+	docker-compose -f docker-compose.yml -f docker-compose.local.yml build --no-cache
 
 up:
-	docker-compose --env-file .env -f docker-compose.yml -f docker-compose.local.yml up
+	docker-compose -f docker-compose.yml -f docker-compose.local.yml up
 
 # prod:
 #     ...
@@ -17,4 +17,4 @@ clean: down
 	docker system prune -f
 
 localdb:
-	docker-compose --env-file .env -f docker-compose.yml -f docker-compose.local.yml up -d db
+	docker-compose -f docker-compose.yml -f docker-compose.local.yml up -d db

docker-compose.local.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   zipsoon-network:
     driver: bridge

docker-compose.yml

@@ -1,12 +1,20 @@
-version: "3.9"
+x-env-files: &env-files
+  env_file:
+    - .env.example
+    - .env
 
 services:
+  db:
+    <<: *env-files
+
   batch:
     build:
       context: .
       dockerfile: batch/Dockerfile
+    <<: *env-files
 
   api:
     build:
       context: .
-      dockerfile: api/Dockerfile
+      dockerfile: api/Dockerfile
+    <<: *env-files