From 2dbb98be751c768308086bc2ed55c67bc2e85baa Mon Sep 17 00:00:00 2001
From: Evgeny Ulin <eulin@ronasit.com>
Date: Tue, 12 Nov 2024 18:05:30 +0300
Subject: [PATCH 1/2] Fixed a typo in docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 62287a2..75d25ad 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       - .:/app
 
   pgsql_test:
-    image: bitnami/postgresql:16
+    image: bitnami/postgresql:16.1.0
     ports:
       - 5433:5432
     environment:

From 0df5e0f769d61edbb5807abf842037914706bff1 Mon Sep 17 00:00:00 2001
From: dpankratov <dpankratov@ronasit.com>
Date: Mon, 2 Dec 2024 13:21:17 +0600
Subject: [PATCH 2/2] feat: use the same postgre version for testing and
 develop

---
 app/Providers/AppServiceProvider.php | 1 +
 composer.json                        | 2 +-
 docker-compose.analyse.yaml          | 6 ------
 docker-compose.yml                   | 4 ++--
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 docker-compose.analyse.yaml

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 102b8df..35521b9 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -19,6 +19,7 @@ public function boot(): void
          * @param  VersionEnum|null  $end
          * @param  string|null  $param  (default is 'version')
          * @param  Route|null  $instance
+         *
          * @return Route|RouteRegistrar
          */
         $versionRange = function (?VersionEnum $start, ?VersionEnum $end, ?string $param, ?Route $instance = null) {
diff --git a/composer.json b/composer.json
index 6e11199..1070f49 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
         "stop-on-failure": ["pre-commit"]
       },
       "pre-commit": [
-        "docker compose -f docker-compose.analyse.yaml up -d && docker compose -f docker-compose.analyse.yaml exec -T nginx vendor/bin/pint"
+        "docker compose up -d php && docker compose exec -T nginx vendor/bin/pint --repair"
       ]
     }
   },
diff --git a/docker-compose.analyse.yaml b/docker-compose.analyse.yaml
deleted file mode 100644
index 65dd2e0..0000000
--- a/docker-compose.analyse.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  nginx:
-    image: webdevops/php:8.3-alpine
-    working_dir: /app
-    volumes:
-      - .:/app
diff --git a/docker-compose.yml b/docker-compose.yml
index d536012..2a534f7 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       XDEBUG_CLIENT_HOST: host.docker.internal
 
   pgsql:
-    image: bitnami/postgresql:16.1.0
+    image: bitnami/postgresql:16
     ports:
       - 5432:5432
     environment:
@@ -34,7 +34,7 @@ services:
       - .:/app
 
   pgsql_test:
-    image: bitnami/postgresql:16.1.0
+    image: bitnami/postgresql:16
     ports:
       - 5433:5432
     environment: