Skip to content

Commit e024283

Browse files
joanheyjoanhey
committed
[php] Ubiquity update to PHP 8.5
1 parent 96d08ff commit e024283

7 files changed

+39
-40
lines changed

‎frameworks/PHP/ubiquity/ubiquity-roadrunner-mysql.dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM ubuntu:20.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 php8.3 php8.3-common php8.3-cgi php-curl php8.3-mysql > /dev/null
8+
apt-get install -yqq php8.4 php8.4-common php8.4-cgi php-curl php8.4-mysql > /dev/null
99

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

1212
RUN apt-get install -y php-pear php-dev > /dev/null
1313

14-
COPY deploy/conf/php-async.ini /etc/php/8.3/cgi/php.ini
14+
COPY deploy/conf/php-async.ini /etc/php/8.4/cgi/php.ini
1515

1616
ADD ./ /ubiquity
1717
WORKDIR /ubiquity
@@ -33,8 +33,8 @@ RUN chmod 755 /bin/envwrapper.sh
3333

3434
RUN chmod 777 -R /ubiquity/.ubiquity/*
3535

36-
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.3/cgi/php.ini
37-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.3/cgi/php.ini
36+
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/cgi/php.ini
37+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cgi/php.ini
3838

3939
COPY deploy/conf/roadrunner/mysql/rrServices.php app/config/rrServices.php
4040

‎frameworks/PHP/ubiquity/ubiquity-roadrunner.dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
FROM ubuntu:20.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 php8.3 php8.3-common php8.3-cgi php8.3-pgsql php-curl > /dev/null
8+
apt-get install -yqq php8.4 php8.4-common php8.4-cgi php8.4-pgsql php-curl > /dev/null
99

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

1212
RUN apt-get install -y php-pear php-dev > /dev/null
1313

14-
15-
COPY deploy/conf/php-async.ini /etc/php/8.3/cgi/php.ini
14+
COPY deploy/conf/php-async.ini /etc/php/8.4/cgi/php.ini
1615

1716
ADD ./ /ubiquity
1817
WORKDIR /ubiquity
@@ -34,8 +33,8 @@ RUN chmod 755 /bin/envwrapper.sh
3433

3534
RUN chmod 777 -R /ubiquity/.ubiquity/*
3635

37-
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.3/cgi/php.ini
38-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.3/cgi/php.ini
36+
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/cgi/php.ini
37+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.4/cgi/php.ini
3938

4039
COPY deploy/conf/roadrunner/pgsql/rrServices.php app/config/rrServices.php
4140

‎frameworks/PHP/ubiquity/ubiquity-workerman-mongo.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
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
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq git php8.4-cli php8.4-mongodb php8.4-xml php8.4-mbstring > /dev/null
8+
apt-get install -yqq git php8.5-cli php8.5-mongodb php8.5-xml php8.5-mbstring > /dev/null
99

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

12-
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.5-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.5/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818

@@ -31,8 +31,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3131

3232
COPY deploy/conf/workerman/mongo/workerServices.php app/config/workerServices.php
3333

34-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/cli/php.ini
35-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cli/php.ini
34+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.5/cli/php.ini
35+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.5/cli/php.ini
3636

3737
EXPOSE 8080
3838

‎frameworks/PHP/ubiquity/ubiquity-workerman-mysql.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
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 git php8.4-cli php8.4-mysql php8.4-xml php8.4-mbstring > /dev/null
8+
apt-get install -yqq git php8.5-cli php8.5-mysql php8.5-xml php8.5-mbstring > /dev/null
99

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

12-
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.5-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.5/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/mysql/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.5/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.5/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity-workerman-raw.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
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 git php8.4-cli php8.4-pgsql php8.4-xml php8.4-mbstring > /dev/null
8+
apt-get install -yqq git php8.5-cli php8.5-pgsql php8.5-xml php8.5-mbstring > /dev/null
99

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

12-
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.5-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.5/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/pgsql/raw/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.4/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.5/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.5/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity-workerman.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
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 git php8.4-cli php8.4-pgsql php8.4-xml php8.4-mbstring > /dev/null
8+
apt-get install -yqq git php8.5-cli php8.5-pgsql php8.5-xml php8.5-mbstring > /dev/null
99

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

12-
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.5-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.5/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/pgsql/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.4/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.4/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.5/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.5/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity.dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ ARG DEBIAN_FRONTEND=noninteractive
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.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-dev > /dev/null
8+
apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql php8.5-dev > /dev/null
99

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

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

1414
ADD ./ /ubiquity
1515
WORKDIR /ubiquity
1616

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;
17+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
1818

1919
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
2020

2121
RUN chmod 777 -R /ubiquity/app/cache/*
2222

2323
COPY deploy/conf/ubiquity-config.php app/config/config.php
2424

25-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/fpm/php.ini
25+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.5/fpm/php.ini
2626

2727
EXPOSE 8080
2828

29-
CMD service php8.4-fpm start && \
29+
CMD service php8.5-fpm start && \
3030
nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"

0 commit comments

Comments
 (0)