Skip to content

Commit

Permalink
Merge pull request #722 from Pixilib/GaelO2-dev
Browse files Browse the repository at this point in the history
Gael o2 dev
  • Loading branch information
salimkanoun authored Jun 21, 2024
2 parents 27802af + 60611aa commit 744f70d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.2-fpm-bullseye
FROM php:8.3.8-fpm-bookworm

ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
ENV TZ="UTC"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion GaelO2/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
| or any other location as required by the application or its packages.
*/

'version' => '2.6.0',
'version' => '2.6.1',

/*
|--------------------------------------------------------------------------
Expand Down

0 comments on commit 744f70d

Please sign in to comment.