Skip to content

Commit 87130a7

Browse files
authored
[Ubiquity] Update Roadrunner to PHP8 (#6318)
* remove broken tag * update pgsql to php8 * enable pre-loading * enable JIT * JIT Tracing * fix typo * Update ubiquity-roadrunner-mysql.dockerfile * swap betwwen tracing and function for JIT
1 parent 845f16a commit 87130a7

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

frameworks/PHP/ubiquity/benchmark_config.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
"database_os": "Linux",
113113
"display_name": "ubiquity-roadrunner",
114114
"notes": "",
115-
"versus": "php",
116-
"tags": ["broken"]
115+
"versus": "php"
117116
},
118117
"roadrunner-mysql": {
119118
"db_url": "/DbMy",
@@ -134,8 +133,7 @@
134133
"database_os": "Linux",
135134
"display_name": "ubiquity-roadrunner-mysql",
136135
"notes": "",
137-
"versus": "php",
138-
"tags": ["broken"]
136+
"versus": "php"
139137
},
140138
"workerman-mysql": {
141139
"db_url": "/DbMy",

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:20.10
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 php7.4 php7.4-common php7.4-cgi php-curl php7.4-mysql > /dev/null
8+
apt-get install -yqq php8.0 php8.0-common php8.0-cgi php-curl php8.0-mysql > /dev/null
99

1010
RUN apt-get install -yqq composer > /dev/null
1111

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

14-
COPY deploy/conf/php-async.ini /etc/php/7.4/cgi/php.ini
14+
COPY deploy/conf/php-async.ini /etc/php/8.0/cgi/php.ini
1515

1616
ADD ./ /ubiquity
1717
WORKDIR /ubiquity
@@ -37,7 +37,8 @@ RUN chmod 755 /bin/envwrapper.sh
3737

3838
RUN chmod 777 -R /ubiquity/.ubiquity/*
3939

40-
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/7.4/cgi/php.ini
40+
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.0/cgi/php.ini
41+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.0/cgi/php.ini
4142

4243
COPY deploy/conf/roadrunner/mysql/rrServices.php app/config/rrServices.php
4344

frameworks/PHP/ubiquity/ubiquity-roadrunner.dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

2-
FROM ubuntu:20.04
2+
FROM ubuntu:20.10
33

44
ARG DEBIAN_FRONTEND=noninteractive
55

66
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
77
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
88
RUN apt-get update -yqq > /dev/null && \
9-
apt-get install -yqq php7.4 php7.4-common php7.4-cgi php7.4-pgsql php-curl > /dev/null
9+
apt-get install -yqq php8.0 php8.0-common php8.0-cgi php8.0-pgsql php-curl > /dev/null
1010

1111
RUN apt-get install -yqq composer > /dev/null
1212

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

1515

16-
COPY deploy/conf/php-async.ini /etc/php/7.4/cgi/php.ini
16+
COPY deploy/conf/php-async.ini /etc/php/8.0/cgi/php.ini
1717

1818
ADD ./ /ubiquity
1919
WORKDIR /ubiquity
@@ -39,7 +39,8 @@ RUN chmod 755 /bin/envwrapper.sh
3939

4040
RUN chmod 777 -R /ubiquity/.ubiquity/*
4141

42-
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/7.4/cgi/php.ini
42+
#RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.0/cgi/php.ini
43+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.0/cgi/php.ini
4344

4445
COPY deploy/conf/roadrunner/pgsql/rrServices.php app/config/rrServices.php
4546

0 commit comments

Comments
 (0)