diff --git a/.idea/php.xml b/.idea/php.xml index fe3b67d6a..e891f5e94 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -204,16 +204,6 @@ - - - - - - - - - - @@ -235,14 +225,14 @@ - + /usr/local/etc/php/conf.d/docker-fpm.ini, /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini, /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini, /usr/local/etc/php/conf.d/docker-php-ext-igbinary.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini /usr/local/etc/php/php.ini - + @@ -262,7 +252,6 @@ - diff --git a/Dockerfile b/Dockerfile index 228de395b..0186a64b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0-fpm +FROM php:8.3.2-fpm ENV APP_ENV prod ENV APP_DEBUG 0 @@ -18,7 +18,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers) -COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/ +COPY --from=mlocati/php-extension-installer:2.1.77 /usr/bin/install-php-extensions /usr/local/bin/ # Install and enable all necessary PHP extensions RUN install-php-extensions \ @@ -31,7 +31,7 @@ RUN install-php-extensions \ zip # Copy the Composer PHAR from the Composer image into the PHP image -COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2.6.6 /usr/bin/composer /usr/bin/composer # Enable Composer autocompletion RUN composer completion bash > /etc/bash_completion.d/composer diff --git a/Dockerfile_dev b/Dockerfile_dev index 604c741c2..2ceb154ee 100644 --- a/Dockerfile_dev +++ b/Dockerfile_dev @@ -1,4 +1,4 @@ -FROM php:8.3.0-fpm +FROM php:8.3.2-fpm # Let's use bash as a default shell with login each time SHELL ["/bin/bash", "--login", "-c"] @@ -10,7 +10,7 @@ ARG HOST_GID # Declare constants ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin" ENV NVM_VERSION v0.39.5 -ENV NODE_VERSION 21.3.0 +ENV NODE_VERSION 21.6.0 # Update package list and install necessary libraries RUN apt-get update \ @@ -56,7 +56,7 @@ ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 # Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers) -COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/ +COPY --from=mlocati/php-extension-installer:2.1.77 /usr/bin/install-php-extensions /usr/local/bin/ # Enable all necessary PHP packages RUN install-php-extensions \ @@ -70,7 +70,7 @@ RUN install-php-extensions \ zip # Copy the Composer PHAR from the Composer image into the PHP image -COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2.6.6 /usr/bin/composer /usr/bin/composer # Enable Composer autocompletion RUN composer completion bash > /etc/bash_completion.d/composer