Skip to content

Commit d7a5c8f

Browse files
joanheyjoanhey
committed
Merge commit '2b3648be1f54c38cad12f76b9f85b89523182ce3' into php-8.4
2 parents 9bf0339 + 2b3648b commit d7a5c8f

File tree

8 files changed

+42
-43
lines changed

8 files changed

+42
-43
lines changed

‎frameworks/PHP/php/php-caddy.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
7-
apt-get update -yqq > /dev/null && apt-get upgrade -yqq
7+
apt-get update -yqq > /dev/null && apt-get upgrade -yqq
88

99
RUN apt-get install -yqq git unzip curl \
10-
php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql > /dev/null
10+
php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
1111

12-
COPY deploy/conf/* /etc/php/8.3/fpm/
12+
COPY deploy/conf/* /etc/php/8.4/fpm/
1313

1414
# Install Caddyserver
1515
RUN apt-get install -y debian-keyring debian-archive-keyring apt-transport-https > /dev/null \
@@ -20,11 +20,11 @@ RUN apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
2020
ADD ./ /php
2121
WORKDIR /php
2222

23-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
23+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
2424

2525
RUN chmod -R 777 /php
2626

2727
EXPOSE 8080
2828

29-
CMD service php8.3-fpm start && \
29+
CMD service php8.4-fpm start && \
3030
caddy run --config deploy/caddy/Caddyfile

‎frameworks/PHP/php/php-eloquent.dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-mbstring php8.3-dev > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-dev > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
COPY deploy/conf/* /etc/php/8.3/fpm/
12+
COPY deploy/conf/* /etc/php/8.4/fpm/
1313

1414
ADD ./ /php
1515
WORKDIR /php
1616

17-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
17+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
1818

1919
COPY deploy/eloquent/composer* ./
2020
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -23,6 +23,5 @@ RUN chmod -R 777 /php
2323

2424
EXPOSE 8080
2525

26-
CMD service php8.3-fpm start && \
26+
CMD service php8.4-fpm start && \
2727
nginx -c /php/deploy/nginx7.conf -g "daemon off;"
28-

‎frameworks/PHP/php/php-h2o.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN apt-get -yqq update && \
4444

4545
FROM "ubuntu:${UBUNTU_VERSION}"
4646

47-
ARG PHP_VERSION=8.3
47+
ARG PHP_VERSION=8.4
4848

4949
ENV TZ=America/Los_Angeles
5050

@@ -75,5 +75,5 @@ ARG TFB_TEST_DATABASE
7575
ARG TFB_TEST_NAME
7676

7777
CMD sed -i "s/num-threads: x/num-threads: $((2 * $(nproc)))/g" /opt/h2o/etc/h2o.conf && \
78-
service php8.3-fpm start && \
78+
service php8.4-fpm start && \
7979
/opt/h2o/bin/h2o -c /opt/h2o/etc/h2o.conf

‎frameworks/PHP/php/php-laravel-query-builder.dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-mbstring php8.3-dev > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-dev > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
COPY deploy/conf/* /etc/php/8.3/fpm/
12+
COPY deploy/conf/* /etc/php/8.4/fpm/
1313

1414
ADD ./ /php
1515
WORKDIR /php
1616

17-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
17+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
1818

1919
COPY deploy/eloquent/composer* ./
2020
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -23,5 +23,5 @@ RUN chmod -R 777 /php
2323

2424
EXPOSE 8080
2525

26-
CMD service php8.3-fpm start && \
26+
CMD service php8.4-fpm start && \
2727
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

‎frameworks/PHP/php/php-pgsql-raw.dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-pgsql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-pgsql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.3/fpm/
10+
COPY deploy/conf/* /etc/php/8.4/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
@@ -17,11 +17,11 @@ RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" dbquery.php
1717
RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" fortune.php
1818
RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" updateraw.php
1919

20-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
20+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
2121

2222
RUN chmod -R 777 /php
2323

2424
EXPOSE 8080
2525

26-
CMD service php8.3-fpm start && \
26+
CMD service php8.4-fpm start && \
2727
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

‎frameworks/PHP/php/php-pools.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.3/fpm/
10+
COPY deploy/conf/* /etc/php/8.4/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
1414

15-
COPY deploy/conf/php-fpm-pools.conf /etc/php/8.3/fpm/php-fpm.conf
16-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
15+
COPY deploy/conf/php-fpm-pools.conf /etc/php/8.4/fpm/php-fpm.conf
16+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
1717

1818
RUN chmod -R 777 /php
1919

2020
EXPOSE 8080
2121

22-
CMD service php8.3-fpm start && \
22+
CMD service php8.4-fpm start && \
2323
nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"

‎frameworks/PHP/php/php-raw7-tcp.dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.3/fpm/
10+
COPY deploy/conf/* /etc/php/8.4/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
1414

15-
RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.3/fpm/php-fpm.conf
15+
RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.4/fpm/php-fpm.conf
1616
RUN sed -i "s|server unix:/var/run/php/php-fpm.sock;|server 127.0.0.1:9001;|g" deploy/nginx7.conf
1717

18-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
18+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
1919

2020
RUN chmod -R 777 /php
2121

2222
EXPOSE 8080
2323

24-
CMD service php8.3-fpm start && \
25-
nginx -c /php/deploy/nginx7.conf -g "daemon off;"
24+
CMD service php8.4-fpm start && \
25+
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

‎frameworks/PHP/php/php.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq
88
RUN apt-get install -yqq nginx git unzip \
9-
php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql > /dev/null
9+
php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
1010

11-
COPY deploy/conf/* /etc/php/8.3/fpm/
11+
COPY deploy/conf/* /etc/php/8.4/fpm/
1212

1313
ADD ./ /php
1414
WORKDIR /php
1515

16-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
17-
RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.3/fpm/conf.d/10-opcache.ini
16+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
17+
RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.4/fpm/conf.d/10-opcache.ini
1818

1919
RUN chmod -R 777 /php
2020

2121
EXPOSE 8080
2222

23-
CMD service php8.3-fpm start && \
23+
CMD service php8.4-fpm start && \
2424
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

0 commit comments

Comments
 (0)