Skip to content

Commit 86ef3d2

Browse files
authored
Merge pull request #3013 from tarlepp/chore(env)/php-update
Chore(env) - PHP update
2 parents 4427d10 + 1e13b0c commit 86ef3d2

28 files changed

+338
-381
lines changed

.idea/php.xml

Lines changed: 2 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/symfony-flex-backend.iml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7-labs
2-
FROM php:8.4.6-fpm-bullseye
2+
FROM php:8.4.8-fpm-bookworm
33

44
ENV APP_ENV prod
55
ENV APP_DEBUG 0
@@ -19,7 +19,7 @@ RUN apt-get update \
1919
&& rm -rf /var/lib/apt/lists/*
2020

2121
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
22-
COPY --from=mlocati/php-extension-installer:2.7.31 /usr/bin/install-php-extensions /usr/local/bin/
22+
COPY --from=mlocati/php-extension-installer:2.8.2 /usr/bin/install-php-extensions /usr/local/bin/
2323

2424
# Install and enable all necessary PHP extensions
2525
RUN install-php-extensions \
@@ -40,7 +40,7 @@ RUN apt-get update \
4040
&& rm -rf /var/lib/apt/lists/*
4141

4242
# Copy the Composer PHAR from the Composer image into the PHP image
43-
COPY --from=composer:2.8.8 /usr/bin/composer /usr/bin/composer
43+
COPY --from=composer:2.8.9 /usr/bin/composer /usr/bin/composer
4444

4545
# Enable Composer autocompletion
4646
RUN composer completion bash > /etc/bash_completion.d/composer

Dockerfile_dev

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.4.6-fpm-bullseye
1+
FROM php:8.4.8-fpm-bookworm
22

33
# Let's use bash as a default shell with login each time
44
SHELL ["/bin/bash", "--login", "-c"]
@@ -9,13 +9,14 @@ ARG HOST_GID
99

1010
# Declare constants
1111
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin"
12-
ENV NVM_VERSION v0.40.1
13-
ENV NODE_VERSION 23.11.0
12+
ENV NVM_VERSION v0.40.3
13+
ENV NODE_VERSION 24.3.0
1414

1515
# Update package list and install necessary libraries
1616
RUN apt-get update \
1717
&& apt-get install -y \
1818
bash-completion \
19+
build-essential \
1920
fish \
2021
g++ \
2122
git \
@@ -35,6 +36,7 @@ RUN apt-get update \
3536
vim \
3637
wget \
3738
zlib1g-dev \
39+
&& apt-get upgrade -y \
3840
&& rm -rf /var/lib/apt/lists/*
3941

4042
RUN echo 'deb http://download.opensuse.org/repositories/shells:/fish/Debian_12/ /' | \
@@ -56,7 +58,7 @@ ENV LANGUAGE en_US:en
5658
ENV LC_ALL en_US.UTF-8
5759

5860
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
59-
COPY --from=mlocati/php-extension-installer:2.7.31 /usr/bin/install-php-extensions /usr/local/bin/
61+
COPY --from=mlocati/php-extension-installer:2.8.2 /usr/bin/install-php-extensions /usr/local/bin/
6062

6163
# Enable all necessary PHP packages
6264
RUN install-php-extensions \
@@ -78,7 +80,7 @@ RUN apt-get update \
7880
&& rm -rf /var/lib/apt/lists/*
7981

8082
# Copy the Composer PHAR from the Composer image into the PHP image
81-
COPY --from=composer:2.8.8 /usr/bin/composer /usr/bin/composer
83+
COPY --from=composer:2.8.9 /usr/bin/composer /usr/bin/composer
8284

8385
# Enable Composer autocompletion
8486
RUN composer completion bash > /etc/bash_completion.d/composer

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"config": {
9797
"allow-plugins": true,
9898
"platform": {
99-
"php": "8.4.6"
99+
"php": "8.4.8"
100100
},
101101
"sort-packages": true
102102
},

0 commit comments

Comments
 (0)