From 0fc181bf12682a342952b59c5dced961fbf31d14 Mon Sep 17 00:00:00 2001
From: Leonid Nikitin <i@kor-elf.net>
Date: Sun, 26 Jul 2026 02:20:13 +0500
Subject: [PATCH] Update Docker Compose files to use consolidated Dockerfile

- Replace references to separate `php/Dockerfile` and `web/Dockerfile` with the unified `docker/Dockerfile`.
- Adjust target stages across services for development and production environments.
---
 docker-compose-prod.yml | 17 +++++++++--------
 docker-compose.yml      | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 958f4df..d2c714d 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -3,8 +3,9 @@ services:
   web:
     build:
       context: app
-      dockerfile: docker/web/Dockerfile
-      target: DEVELOP
+      dockerfile: docker/Dockerfile
+      target: WEB_PRODUCTION
+      #  restart: always
     depends_on:
       - app
     ports:
@@ -21,8 +22,8 @@ services:
   app:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: PRODUCTION
+      dockerfile: docker/Dockerfile
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
       - db
@@ -37,8 +38,8 @@ services:
   queue:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: PRODUCTION
+      dockerfile: docker/Dockerfile
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
       - app
@@ -52,8 +53,8 @@ services:
   scheduler:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: PRODUCTION
+      dockerfile: docker/Dockerfile
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
       - app
diff --git a/docker-compose.yml b/docker-compose.yml
index b756861..448140d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ services:
   web:
     build:
       context: app
-      dockerfile: docker/web/Dockerfile
-      target: DEVELOP
+      dockerfile: docker/Dockerfile
+      target: WEB_DEVELOP
     depends_on:
       - app
     ports:
@@ -21,8 +21,8 @@ services:
   app:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: DEVELOP
+      dockerfile: docker/Dockerfile
+      target: APP_DEVELOP
     depends_on:
       - db
       - app-redis
@@ -36,8 +36,8 @@ services:
   queue:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: DEVELOP
+      dockerfile: docker/Dockerfile
+      target: APP_DEVELOP
     depends_on:
       - db
       - app
@@ -50,8 +50,8 @@ services:
   scheduler:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
-      target: DEVELOP
+      dockerfile: docker/Dockerfile
+      target: APP_DEVELOP
     depends_on:
       - db
       - app
@@ -146,7 +146,7 @@ services:
   artisan:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
+      dockerfile: docker/Dockerfile
       target: ARTISAN
     user: "${UID}:${GID}"
     volumes:
@@ -155,7 +155,7 @@ services:
   composer:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
+      dockerfile: docker/Dockerfile
       target: COMPOSER
     user: "${UID}:${GID}"
     volumes:
@@ -164,7 +164,7 @@ services:
   npm:
     build:
       context: app
-      dockerfile: docker/php/Dockerfile
+      dockerfile: docker/Dockerfile
       target: NPM
     user: "${UID}:${GID}"
     volumes: