refactor: rm nginx+fpm containers and use only frankenphp

.env.dist

@@ -4,7 +4,3 @@ DB_USER=postgres
 DB_PASS=password
 DB_PORT=5432
 DB_SCHEMA=public
-
-# Default web service is nginx+fpm.  Set to 'frankenphp' to use a frankenphp server instead.
-# AP_COMPOSE_STACK=frankenphp
-AP_COMPOSE_STACK=nginx

.github/workflows/run-checks.yaml

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

Makefile

@@ -17,11 +17,7 @@ ifneq (,$(wildcard ./.env))
     export
 endif
 
-ifeq ($(AP_COMPOSE_STACK),frankenphp)
-	COMPOSE_FILE := docker-compose.frankenphp.yml
-else
-	COMPOSE_FILE := docker-compose.yml
-endif
+COMPOSE_FILE := docker-compose.yml
 
 list:
 	@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -131,7 +127,7 @@ rm-network: ## Remove application docker network. (traefik
 	-bin/remove-external-network.sh wp-services
 
 build-prod:
-	docker build --target prod -t aspirepress/aspirecloud-php -f ./docker/webapp-frankenphp/Dockerfile .
+	docker build --target prod -t aspirepress/aspirecloud-php -f ./docker/webapp/Dockerfile .
 
 traefik-up: network
 	docker compose -f docker/traefik/docker-compose.yml up -d

docker-compose.yml

@@ -1,14 +1,16 @@
 services:
-  nginx:
+  webapp:
     build:
       context: .
-      dockerfile: ./docker/nginx/Dockerfile
+      dockerfile: docker/webapp/Dockerfile
+      target: dev
     ports:
       - ${LOCAL_HTTP_PORT:-8099}:80
-      - ${LOCAL_HTTPS_PORT:-8100}:443
     volumes:
       - .:/var/www/html
-      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    env_file:
+      - .env.dist
+      - .env
     networks:
       traefik: ~
       aspirepress-cdn: ~
@@ -21,20 +23,6 @@ services:
       - "traefik.http.routers.ap-api-https.rule=Host(`api.aspirepress.local`)"
       - "traefik.http.routers.ap-api-https.tls=true"
 
-  webapp:
-    build:
-      context: .
-      dockerfile: docker/webapp-fpm/Dockerfile
-      target: devphp
-    volumes:
-      - .:/var/www/html
-    env_file:
-      - .env.dist
-      - .env
-    networks:
-      - aspirepress-cdn
-      - application
-
   redis:
     image: redis:latest
     networks:
@@ -47,7 +35,7 @@ services:
       - PGDATA=/opt/pgdata
       - POSTGRES_DB=aspirepress_cdn
     ports:
-      - ${LOCAL_POSTGRES_PORT:-5432}:5432
+      - "${LOCAL_POSTGRES_PORT:-5432}:5432"
     volumes:
       - postgresdata:/opt/pgdata
     networks:

docker/webapp-frankenphp/Dockerfile → docker/webapp/Dockerfile

@@ -7,8 +7,8 @@ RUN install-php-extensions pdo pdo_pgsql zip intl redis
 
 RUN apk add bash git postgresql-client zip
 
-COPY ./docker/webapp-frankenphp/Caddyfile /etc/caddy/Caddyfile
-COPY ./docker/webapp-frankenphp/php.ini /usr/local/etc/php/php.ini
+COPY ./docker/webapp/Caddyfile /etc/caddy/Caddyfile
+COPY ./docker/webapp/php.ini /usr/local/etc/php/php.ini
 
 WORKDIR /var/www/html