From 5a44b4a41746217d6db2e9cd2e58e20fad4442b8 Mon Sep 17 00:00:00 2001
From: Naramsim <igougi.ui@gmail.com>
Date: Mon, 25 Mar 2024 22:01:11 +0100
Subject: [PATCH] feat: move to V2

---
 .dockerignore          |  2 +-
 Makefile               | 22 +++++++++++-----------
 docker-compose-dev.yml |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index dd4e3be51..48324223d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,7 +18,7 @@ graphql
 .vscode
 .github
 .circleci
-docker-compose.yml
+docker-compose*
 .dockerignore
 /*.md
 /*.js
diff --git a/Makefile b/Makefile
index 33d903101..3760771a3 100755
--- a/Makefile
+++ b/Makefile
@@ -42,38 +42,38 @@ shell:  # Load a shell
 	python manage.py shell ${local_config}
 
 docker-up:  # (Docker) Create services/volumes/networks
-	docker-compose up -d
+	docker compose up -d
 
 docker-migrate:  # (Docker) Run any pending migrations
-	docker-compose exec -T app python manage.py migrate ${docker_config}
+	docker compose exec -T app python manage.py migrate ${docker_config}
 
 docker-build-db:  # (Docker) Build the database
-	docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${docker_config}'
+	docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${docker_config}'
 
 docker-make-migrations:  # (Docker) Create migrations files if schema has changed
-	docker-compose exec -T app sh -c 'python manage.py makemigrations ${docker_config}'
+	docker compose exec -T app sh -c 'python manage.py makemigrations ${docker_config}'
 
 docker-flush-db:  # (Docker) Removes all the data present in the database but preserves tables and migrations
-	docker-compose exec -T app sh -c 'python manage.py flush --no-input ${docker_config}'
+	docker compose exec -T app sh -c 'python manage.py flush --no-input ${docker_config}'
 
 docker-destroy-db:  # (Docker) Removes the volume where the database is installed on, alongside to the container itself
 	docker rm -f pokeapi_db_1
 	docker volume rm pokeapi_pg_data
 
 docker-shell:  # (Docker) Launch an interative shell for the pokeapi container
-	docker-compose exec app sh -l
+	docker compose exec app sh -l
 
 docker-stop:  # (Docker) Stop containers
-	docker-compose stop
+	docker compose stop
 
 docker-down:  # (Docker) Stop and removes containers and networks
-	docker-compose down
+	docker compose down
 
 docker-test:  # (Docker) Run tests
-	docker-compose exec -T app python manage.py test ${local_config}
+	docker compose exec -T app python manage.py test ${local_config}
 
 docker-prod:
-	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
 
 docker-setup: docker-up docker-migrate docker-build-db  # (Docker) Start services, prepare the latest DB schema, populate the DB
 
@@ -148,4 +148,4 @@ update-graphql-data-prod:
 	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
 	docker compose start graphql-engine
 	sleep 120
-	make hasura-apply
+	make hasura-apply
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 77e0dc5e4..4df009e6f 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -6,4 +6,4 @@ services:
       context: .
       dockerfile: ./Resources/docker/app/Dockerfile
 
-# docker-compose -f docker-compose.yml -f docker-compose-dev.yml up -d
+# docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d