feat: update docker compose

.gitattributes

@@ -0,0 +1,6 @@
+* text=auto eol=lf
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.ps1 text eol=crlf
+docker/Dockerfile text eol=lf
+docker/*.sh text eol=lf

.github/workflows/test.yml

@@ -60,8 +60,8 @@ jobs:
       - name: Setup test environment
         run: |
           touch .env
-          docker compose -f docker-compose.dev.yml down -v --remove-orphans
-          docker compose -f docker-compose.dev.yml up postgres redis -d --wait --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml down -v --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml up postgres redis -d --wait --remove-orphans
           poetry run make certs
 
       - name: Run tests
@@ -77,7 +77,7 @@ jobs:
 
       - name: Teardown test environment
         run: |
-          docker compose -f docker-compose.dev.yml down -v --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml down -v --remove-orphans
 
       - name: Store coverage files
         uses: actions/upload-artifact@v4

.gitignore

@@ -160,8 +160,16 @@ cython_debug/
 .idea/
 
 # Environments
-*.env
-.dev.env
-!.env.example
-certs
+*.env*
+certs/
+
+# Git worktrees
+.worktrees/
+
+# AI agents
 .codegraph/
+docs/adr/
+docs/superpowers/
+docs/glossary.md
+compose-obs.yml
+compose-prod.yml

.pre-commit-config.yaml

@@ -59,7 +59,9 @@ repos:
     hooks:
       - id: detect-secrets
         args: [
-          '--baseline', '.secrets.baseline',
+          '--exclude-files', 'docs',
+          '--exclude-files', 'migrations',
+          '--exclude-files', 'alembic.ini',
         ]
         exclude: package.lock.json
         stages: [ pre-commit, pre-merge-commit, manual ]

Makefile

@@ -7,35 +7,35 @@ certs:
 
 .PHONY: deps
 deps:
-	docker compose -f docker-compose.dev.yml up postgres redis -d --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml up postgres redis -d --build --remove-orphans --wait
 
 .PHONY: up
 up:
-	docker compose -f docker-compose.dev.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml up --build --remove-orphans --wait
+
+.PHONY: recreate
+recreate:
+	docker compose -f compose.yml -f compose-dev.yml up --build --force-recreate --remove-orphans --wait
 
 .PHONY: start
 start:
-	docker compose -f docker-compose.dev.yml start
+	docker compose -f compose.yml -f compose-dev.yml start
 
 .PHONY: build
 build:
 	docker build -t fastid:latest -f docker/Dockerfile .
 
 .PHONY: up-obs
 up-obs:
-	docker compose -f docker-compose.dev.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
+	docker compose -f compose-dev.yml -f compose-observability.yml up --build --remove-orphans --wait
 
 .PHONY: up-prod
 up-prod:
-	docker compose -f docker-compose.dev.yml -f docker-compose.prod.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml -f compose-prod.yml up --build --remove-orphans --wait
 
 .PHONY: up-prod-obs
 up-prod-obs:
-	docker compose -f docker-compose.dev.yml -f docker-compose.prod.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
-
-.PHONY: up-example
-up-example:
-	docker compose -f docker-compose.example.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml -f compose-prod.yml -f compose-obs.yml up --build --remove-orphans --wait
 
 .PHONY: test
 test:
@@ -51,15 +51,15 @@ testcov:
 
 .PHONY: stop
 stop:
-	docker compose -f docker-compose.dev.yml stop
+	docker compose -f compose.yml -f compose-dev.yml stop
 
 .PHONY: down
 down:
-	docker compose -f docker-compose.dev.yml down
+	docker compose -f compose.yml -f compose-dev.yml down
 
 .PHONY: restart
 restart:
-	docker compose -f docker-compose.dev.yml restart
+	docker compose -f compose.yml -f compose-dev.yml restart
 
 .PHONY: lint
 lint:

README.md

@@ -54,7 +54,7 @@
 ### Download the Compose file
 
 ```bash
-wget https://raw.githubusercontent.com/everysoftware/fastid/refs/heads/master/docker-compose.yml
+wget https://raw.githubusercontent.com/everysoftware/fastid/refs/heads/master/compose.yml
 ```
 
 ### Generate keys

compose-dev.yml

@@ -0,0 +1,24 @@
+services:
+  postgres:
+    ports:
+      - "5412:5432"
+  redis:
+    ports:
+      - "6312:6379"
+  mailpit:
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+  fastid-app:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      target: dev
+    volumes:
+      - "./migrations:/opt/fastid/migrations"
+      - "./fastid:/opt/fastid/fastid"
+      - "./templates:/opt/fastid/templates"
+      - "./static:/opt/fastid/static"
+
+volumes:
+  pg_data:

docker-compose.yml → compose.yml

@@ -61,7 +61,7 @@ services:
       - "./certs:/opt/fastid/certs"
 
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/readiness" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:8000/readiness" ]
       interval: 30s
       timeout: 10s
       retries: 3