From 4a42bff0dc6821cf7486c75317a49b926da9e5a6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 9 Jan 2024 15:18:33 +0100
Subject: [PATCH 1/4] Update version numbers to 4.0.0-beta.185

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index a7bbeb2d0..c771962da 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.184',
+    'release' => '4.0.0-beta.185',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index edf3c27d0..836a1000b 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.184';
+return '4.0.0-beta.185';
diff --git a/versions.json b/versions.json
index d96864b76..778016690 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.184"
+            "version": "4.0.0-beta.185"
         }
     }
 }

From f343210e7ca155bb09a23d63567f32fd5260a7f3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 9 Jan 2024 15:22:06 +0100
Subject: [PATCH 2/4] hmm

---
 docker/dev-ssu/Dockerfile  | 2 +-
 docker/prod-ssu/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile
index df98985f4..7c57a1ec2 100644
--- a/docker/dev-ssu/Dockerfile
+++ b/docker/dev-ssu/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.2-fpm-nginx
+FROM serversideup/php:8.1-fpm-nginx-v2.2.0
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases
diff --git a/docker/prod-ssu/Dockerfile b/docker/prod-ssu/Dockerfile
index 79c0a839c..198529327 100644
--- a/docker/prod-ssu/Dockerfile
+++ b/docker/prod-ssu/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.2-fpm-nginx as base
+FROM serversideup/php:8.1-fpm-nginx-v2.2.0 as base
 WORKDIR /var/www/html
 
 COPY composer.json composer.lock ./
@@ -11,7 +11,7 @@ COPY --from=base --chown=9999:9999 /var/www/html .
 RUN npm install
 RUN npm run build
 
-FROM serversideup/php:8.2-fpm-nginx
+FROM serversideup/php:8.1-fpm-nginx-v2.2.0
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases

From c9b3d2a43d9d8dec2f82d827baf8f1d260658ea0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 9 Jan 2024 15:23:37 +0100
Subject: [PATCH 3/4] Update PHP version in Dockerfiles

---
 docker/dev-ssu/Dockerfile  | 2 +-
 docker/prod-ssu/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile
index 7c57a1ec2..5dca22748 100644
--- a/docker/dev-ssu/Dockerfile
+++ b/docker/dev-ssu/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.1-fpm-nginx-v2.2.0
+FROM serversideup/php:8.2-fpm-nginx-v2.2.0
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases
diff --git a/docker/prod-ssu/Dockerfile b/docker/prod-ssu/Dockerfile
index 198529327..a77f032ad 100644
--- a/docker/prod-ssu/Dockerfile
+++ b/docker/prod-ssu/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.1-fpm-nginx-v2.2.0 as base
+FROM serversideup/php:8.2-fpm-nginx-v2.2.0 as base
 WORKDIR /var/www/html
 
 COPY composer.json composer.lock ./
@@ -11,7 +11,7 @@ COPY --from=base --chown=9999:9999 /var/www/html .
 RUN npm install
 RUN npm run build
 
-FROM serversideup/php:8.1-fpm-nginx-v2.2.0
+FROM serversideup/php:8.2-fpm-nginx-v2.2.0
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases

From 32bc876dfc839ed900f4247b2dacac8af8fb4d3b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 9 Jan 2024 19:04:12 +0100
Subject: [PATCH 4/4] fix: php pgsql to 8.2

---
 config/sentry.php          | 2 +-
 config/version.php         | 2 +-
 docker/dev-ssu/Dockerfile  | 2 +-
 docker/prod-ssu/Dockerfile | 6 +++---
 versions.json              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index c771962da..a7bbeb2d0 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.185',
+    'release' => '4.0.0-beta.184',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 836a1000b..edf3c27d0 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.185';
+return '4.0.0-beta.184';
diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile
index 5dca22748..44173ba6b 100644
--- a/docker/dev-ssu/Dockerfile
+++ b/docker/dev-ssu/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update
 RUN apt-get install postgresql-client-$POSTGRES_VERSION -y
 
 # Coolify requirements
-RUN apt-get install -y php-pgsql openssh-client git git-lfs jq lsof
+RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof
 RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/
 
diff --git a/docker/prod-ssu/Dockerfile b/docker/prod-ssu/Dockerfile
index a77f032ad..238fe5658 100644
--- a/docker/prod-ssu/Dockerfile
+++ b/docker/prod-ssu/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.2-fpm-nginx-v2.2.0 as base
+FROM serversideup/php:8.2-fpm-nginx as base
 WORKDIR /var/www/html
 
 COPY composer.json composer.lock ./
@@ -11,7 +11,7 @@ COPY --from=base --chown=9999:9999 /var/www/html .
 RUN npm install
 RUN npm run build
 
-FROM serversideup/php:8.2-fpm-nginx-v2.2.0
+FROM serversideup/php:8.2-fpm-nginx
 
 ARG TARGETPLATFORM
 # https://github.com/cloudflare/cloudflared/releases
@@ -31,7 +31,7 @@ RUN apt-get update
 RUN apt-get install postgresql-client-$POSTGRES_VERSION -y
 
 # Coolify requirements
-RUN apt-get install -y php-pgsql openssh-client git git-lfs jq lsof
+RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof
 RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 COPY docker/prod-ssu/nginx.conf /etc/nginx/conf.d/custom.conf
diff --git a/versions.json b/versions.json
index 778016690..d96864b76 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.185"
+            "version": "4.0.0-beta.184"
         }
     }
 }