Fixing overwritten changes to Makefile (#20)

* Fixing overwritten changes to Makefile

* fix(Makefile): use frankenphp target for build-prod

* ci: build dev target on webapp-frankenphp

---------

Co-authored-by: Chuck Adams <cja987@gmail.com>

.github/workflows/run-checks.yaml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build container
-        run: docker build --target devphp -t aspirepress/aspirecloud-php -f ./docker/webapp/Dockerfile .
+        run: docker build --target dev -t aspirepress/aspirecloud-php -f ./docker/webapp-frankenphp/Dockerfile .
 
       - name: Install Composer dependencies
         run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-php sh -c "composer install"

Makefile

@@ -84,19 +84,19 @@ cs-fix: ## Fix code style issues
 	docker compose -f $(COMPOSE_FILE) run --rm webapp bash -c "vendor/bin/phpcbf ${OPTS} && vendor/bin/phpcs ${OPTS}"
 
 create-migration: ## Create a new database migration
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx create ${OPTS} -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx create ${OPTS} -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 create-seed: ##	Create a new database seed
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:create ${OPTS} -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:create ${OPTS} -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 migrate: ## Run database migrations
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 migration-rollback: ## Rollback database migrations
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx rollback -e development -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx rollback -e development -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 seed: ## Run database seeds
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:run -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:run -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 devmode-enable: ## Enable the PHP development mode
 	docker compose -f $(COMPOSE_FILE) run --rm webapp composer development-enable
@@ -105,16 +105,16 @@ devmode-disable: ## Disable the PHP development mode
 	docker compose -f $(COMPOSE_FILE) run --rm webapp composer development-disable
 
 _empty-database: # internal target to empty database
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -c db/phinx.php -t 0
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -c vendor/aspirepress/aspirecloud-migrations/phinx.php -t 0
 
 migrate-testing: ## Run database migrations
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -e testing -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 seed-testing: ## Run database seeds
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:run -e testing -c db/phinx.php
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx seed:run -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php
 
 _empty-testing-database: # internal target to empty database
-	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -e testing -c db/phinx.php -t 0
+	docker compose -f $(COMPOSE_FILE) run --rm webapp vendor/bin/phinx migrate -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php -t 0
 
 reset-database: _empty-database migrate seed ## Clean database, run migrations and seeds
 
@@ -131,7 +131,7 @@ rm-network: ## Remove application docker network. (traefik
 	-bin/remove-external-network.sh wp-services
 
 build-prod:
-	docker build --target prodphp -t aspirepress/aspirecloud-php -f ./docker/webapp/Dockerfile .
+	docker build --target prod -t aspirepress/aspirecloud-php -f ./docker/webapp-frankenphp/Dockerfile .
 
 traefik-up: network
 	docker compose -f docker/traefik/docker-compose.yml up -d