From 3869a46095f71f4552c725231b683d8601ecb8f8 Mon Sep 17 00:00:00 2001
From: "Alex. Plokhikh" <a.plohih@iqdev.digital>
Date: Sat, 27 Apr 2024 15:37:24 +0500
Subject: [PATCH] STA-931| fix another issues

---
 .env.example              |  5 +++++
 app/composer.json         |  2 +-
 docker-compose.yml        | 18 ++++++++----------
 docker/app/Dockerfile     |  2 +-
 docker/nginx/default.conf |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.env.example b/.env.example
index c6f696d..83ec4f5 100644
--- a/.env.example
+++ b/.env.example
@@ -30,4 +30,9 @@
 
 # ---- symfony/messenger -----
 #MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
+# ----------------------------
+
+# --------- outports ---------
+#NGINX_PORT="80"
+#DB_PORT="5432"
 # ----------------------------
\ No newline at end of file
diff --git a/app/composer.json b/app/composer.json
index 79c0450..564d77e 100644
--- a/app/composer.json
+++ b/app/composer.json
@@ -19,7 +19,7 @@
         "symfony/doctrine-messenger": "6.4.*",
         "symfony/dotenv": "6.4.*",
         "symfony/expression-language": "6.4.*",
-        "symfony/flex": "^2",
+        "symfony/flex": "^2.4",
         "symfony/form": "6.4.*",
         "symfony/framework-bundle": "6.4.*",
         "symfony/http-client": "6.4.*",
diff --git a/docker-compose.yml b/docker-compose.yml
index 3a73066..d1307d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,17 +11,16 @@ services:
     networks:
       - app
     ports:
-      - '5432:5432'
+      - '${DB_PORT}:5432'
 
   nginx:
-    image: nginx:stable-alpine
+    image: nginx:1.25.5-alpine
     container_name: ${APP_NAME}-nginx
     ports:
-      - '80:80'
+      - '${NGINX_PORT}:80'
     volumes:
-      - ./app:/var/www/project
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - ./.env:/var/www/project/.env
+      - ./app/public:/app/public
+      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
     networks:
       - app
     links:
@@ -32,12 +31,11 @@ services:
   app:
     build:
       context: .
-      dockerfile: docker/App.Dockerfile
+      dockerfile: docker/app/Dockerfile
     container_name: ${APP_NAME}-app
-    ports:
-      - '9000:9000'
     volumes:
-      - ./app:/var/www/project
+      - ./app:/app
+      - ./.env:/app/.env
     networks:
       - app
     depends_on:
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 7bde794..3dc122d 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:fpm-alpine
+FROM php:8.3-fpm-alpine
 
 WORKDIR /app
 
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 3a58e90..8b660bf 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -2,7 +2,7 @@ server {
     listen 80;
     index index.php;
     server_name localhost;
-    root /var/www/project/public;
+    root /app/public;
     location / {
         try_files $uri /index.php$is_args$args;
     }
-- 
GitLab