wip: granian

Author: grillazz

Makefile

@@ -4,38 +4,38 @@ help: ## Show this help
 
 .PHONY: docker-build
 docker-build:	## Build project with compose
-	docker-compose build
+	docker compose build
 
 .PHONY: docker-up
 docker-up:	## Run project with compose
-	docker-compose up --remove-orphans
+	docker compose up --remove-orphans
 
 .PHONY: docker-clean
 docker-clean: ## Clean Reset project containers and volumes with compose
-	docker-compose down -v --remove-orphans | true
-	docker-compose rm -f | true
+	docker compose down -v --remove-orphans | true
+	docker compose rm -f | true
 	docker volume rm fastapi_postgres_data | true
 
 .PHONY: docker-apply-db-migrations
 docker-apply-db-migrations: ## apply alembic migrations to database/schema
-	docker-compose run --rm app alembic upgrade head
+	docker compose run --rm app alembic upgrade head
 
 .PHONY: docker-create-db-migration
 docker-create-db-migration:  ## Create new alembic database migration aka database revision.
-	docker-compose up -d db | true
-	docker-compose run --no-deps app alembic revision --autogenerate -m "$(msg)"
+	docker compose up -d db | true
+	docker compose run --no-deps app alembic revision --autogenerate -m "$(msg)"
 
 .PHONY: docker-test
 docker-test:	## Run project tests
-	docker-compose -f docker-compose.yml -f docker-compose.test.yml  run --rm app pytest tests
+	docker compose -f compose.yml -f test-compose.yml  run --rm app pytest tests
 
 .PHONY: docker-test-snapshot
 docker-test-snapshot:	## Run project tests with inline snapshot
-	docker-compose -f docker-compose.yml -f docker-compose.test.yml  run --rm app pytest --inline-snapshot=create
+	docker compose -f compose.yml -f test-compose.yml  run --rm app pytest --inline-snapshot=create
 
 .PHONY: safety
 safety:	## Check project and dependencies with safety https://github.com/pyupio/safety
-	docker-compose run --rm app safety check
+	docker compose run --rm app safety check
 
 .PHONY: py-upgrade
 py-upgrade:	## Upgrade project py files with pyupgrade library for python version 3.10
@@ -51,13 +51,17 @@ slim-build: ## with power of docker-slim build smaller and safer images
 
 .PHONY: docker-feed-database
 docker-feed-database: ## create database objects and insert data
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_work.sql | true
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_chapter.sql | true
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_wordform.sql | true
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_character.sql | true
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_paragraph.sql | true
-	docker-compose exec db psql devdb user -f /home/gx/code/shakespeare_character_work.sql
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_work.sql | true
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_chapter.sql | true
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_wordform.sql | true
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character.sql | true
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_paragraph.sql | true
+	docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character_work.sql
 
 .PHONY: model-generate
 model-generate: ## generate sqlalchemy models from database
 	poetry run sqlacodegen --generator declarative postgresql://user:secret@0.0.0.0/devdb --outfile models.py --schemas shakespeare
+
+.PHONY: docker-up-granian
+docker-up-granian: ## Run project with compose and granian
+	docker compose -f granian-compose.yml up --remove-orphans