Merge branch 'master' into vtk-master

LitusProject · Nov 24, 2024 · 1c590b3 · 1c590b3
2 parents 22c171a + 9cae10d
commit 1c590b3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 33 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 FROM caddy:2.8.4 AS caddy
 
 # development
-FROM composer:2.8.2 AS composer
+FROM composer:2.8.3 AS composer
 
 ARG APPLICATION_ENV=development
 ENV APPLICATION_ENV=${APPLICATION_ENV}
@@ -47,7 +47,7 @@ RUN \
       --optimize; \
   fi
 
-FROM php:8.3.13-cli-alpine AS php-cli
+FROM php:8.4.1-cli-alpine AS php-cli
 
 ARG APPLICATION_ENV=development
 ENV APPLICATION_ENV=${APPLICATION_ENV}
@@ -99,7 +99,7 @@ COPY docker/php-cli/entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
 
-FROM php:8.3.13-fpm-alpine AS php-fpm
+FROM php:8.4.1-fpm-alpine AS php-fpm
 
 ARG APPLICATION_ENV=development
 ENV APPLICATION_ENV=${APPLICATION_ENV}

diff --git a/composer.lock b/composer.lock