From ee45c8c621f2ca157a7c309823350dfd6287494b Mon Sep 17 00:00:00 2001 From: salim kanoun Date: Thu, 13 Jun 2024 08:53:06 +0200 Subject: [PATCH 1/4] update container image --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78cddac3..baf1472a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.2-fpm-bullseye +FROM php:8.3.2-fpm-bookworm ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" ENV TZ="UTC" @@ -27,7 +27,7 @@ RUN apt-get update -qy && \ libpng-dev \ libmemcached-dev \ mariadb-client \ - postgresql-client-13 && \ + postgresql-client && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN pecl install pcov redis memcached From 7698371fd2be72471183d7fa4b6542448b8b8578 Mon Sep 17 00:00:00 2001 From: Salim Kanoun Date: Sun, 16 Jun 2024 22:49:29 +0200 Subject: [PATCH 2/4] update container --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index baf1472a..a6e9510f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.2-fpm-bookworm +FROM php:8.3.8-fpm-bookworm ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" ENV TZ="UTC" From 27c5b0045c9fc5b93da95b835a2a43eb8dc913f4 Mon Sep 17 00:00:00 2001 From: Salim Kanoun Date: Mon, 17 Jun 2024 10:39:20 +0200 Subject: [PATCH 3/4] capture throwable instead of exception --- .../UseCases/ValidateDicomUpload/ValidateDicomUpload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GaelO2/app/GaelO/UseCases/ValidateDicomUpload/ValidateDicomUpload.php b/GaelO2/app/GaelO/UseCases/ValidateDicomUpload/ValidateDicomUpload.php index ea914e44..e15db838 100644 --- a/GaelO2/app/GaelO/UseCases/ValidateDicomUpload/ValidateDicomUpload.php +++ b/GaelO2/app/GaelO/UseCases/ValidateDicomUpload/ValidateDicomUpload.php @@ -17,7 +17,7 @@ use App\GaelO\Services\TusService; use App\GaelO\Services\VisitService; use App\GaelO\Util; -use Exception; +use Throwable; use ZipArchive; class ValidateDicomUpload @@ -191,7 +191,7 @@ public function execute(ValidateDicomUploadRequest $validateDicomUploadRequest, $validateDicomUploadResponse->status = $e->statusCode; $validateDicomUploadResponse->statusText = $e->statusText; $validateDicomUploadResponse->body = $e->getErrorBody(); - } catch (Exception $e) { + } catch (Throwable $e) { $this->handleImportException( $e->getMessage(), From 60611aa275208914ad40c1edf8d538f24e6dc285 Mon Sep 17 00:00:00 2001 From: Salim Kanoun Date: Fri, 21 Jun 2024 22:19:59 +0200 Subject: [PATCH 4/4] 2.6.1 release --- GaelO2/config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GaelO2/config/app.php b/GaelO2/config/app.php index 3b4bbe4c..1a53544d 100644 --- a/GaelO2/config/app.php +++ b/GaelO2/config/app.php @@ -25,7 +25,7 @@ | or any other location as required by the application or its packages. */ - 'version' => '2.6.0', + 'version' => '2.6.1', /* |--------------------------------------------------------------------------