Skip to content

Commit 1192d72

Browse files
authored
Merge pull request #115 from iazaran/Upgrade-to-PHP-8.4
Upgrade PHP to 8.4
2 parents 16b5689 + 92d3653 commit 1192d72

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
},
2222
"config": {
2323
"platform": {
24-
"php": "8.3"
24+
"php": "8.4"
2525
}
2626
},
2727
"require": {
28-
"php": ">=8.3",
28+
"php": "8.4",
2929
"ext-pdo": "*",
3030
"ext-json": "*",
3131
"ext-gd": "*",

composer.lock

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

docker-compose.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
command: cron start -f
6363
volumes:
6464
- ./:/var/www
65-
- ./docker/php/local.ini:/usr/local/etc/php/conf.d/local.in
65+
- ./docker/php/local.ini:/usr/local/etc/php/conf.d/local.ini
6666
networks:
6767
- php-mvc-network
6868

@@ -75,17 +75,18 @@ services:
7575
command: php /var/www/websocket/index.php
7676
volumes:
7777
- ./:/var/www
78-
- ./docker/php/local.ini:/usr/local/etc/php/conf.d/local.in
78+
- ./docker/php/local.ini:/usr/local/etc/php/conf.d/local.ini
7979
networks:
8080
- php-mvc-network
8181

8282
php-mvc-db:
8383
image: mysql
8484
container_name: php-mvc-db
85-
command: --default-authentication-plugin=mysql_native_password
85+
command: --plugin-load-add=mysql_native_password.so
8686
volumes:
8787
- dbdata:/var/lib/mysql
8888
- ./docker/mysql/my.cnf:/etc/mysql/my.cnf
89+
- ./docker/mysql/init.sql:/docker-entrypoint-initdb.d/init.sql
8990
environment:
9091
- MYSQL_ROOT_PASSWORD=root
9192
- MYSQL_DATABASE=mvc_db

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-fpm
1+
FROM php:8.4-fpm
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
apt-utils build-essential curl zip zlib1g-dev libssl-dev unzip \
@@ -18,7 +18,7 @@ RUN pecl install grpc \
1818
&& docker-php-ext-enable grpc
1919
RUN pecl install protobuf \
2020
&& docker-php-ext-enable protobuf
21-
RUN pecl install xdebug \
21+
RUN pecl install xdebug-3.4.0beta1 \
2222
&& docker-php-ext-enable xdebug
2323

2424
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

docker/mysql/init.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
SET @password = '${MYSQL_PASSWORD}';
2+
3+
ALTER USER 'mvc_user'@'%' IDENTIFIED BY @password;
4+
FLUSH PRIVILEGES;

docker/mysql/my.cnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[mysqld]
2+
plugin-load-add=mysql_native_password.so
3+
sql_mode = STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION
24
general_log = 1
35
general_log_file = /var/lib/mysql/general.log
46
secure-file-priv=NULL

0 commit comments

Comments
 (0)