Skip to content

Commit 9439a0f

Browse files
AkazawaYunAkazawaYun
authored
Merge branch 'TechEmpower:master' into master
2 parents f5de772 + 5e14b91 commit 9439a0f

File tree

127 files changed

+1421
-1077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1421
-1077
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
# run-ci.py runs the diffing to see if github actions needs to test this framework. Ideally/eventually,
156156
# we'd like to try and do the diffing before github_actions_clean & setup.
157157
# This will run the tests exactly as you would in your own vm:
158-
docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
158+
docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --force-rm --test-dir $RUN_TESTS --results-environment Github-Actions;
159159
dependabot:
160160
needs: verify
161161
runs-on: ubuntu-latest

‎frameworks/CSharp/genhttp/Benchmarks/Benchmarks.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
<ItemGroup>
3030

31-
<PackageReference Include="$(GENHTTP_ENGINE_PACKAGE)" Version="10.0.0" />
31+
<PackageReference Include="$(GENHTTP_ENGINE_PACKAGE)" Version="10.1.0" />
3232

33-
<PackageReference Include="GenHTTP.Modules.Webservices" Version="10.0.0" />
33+
<PackageReference Include="GenHTTP.Modules.Webservices" Version="10.1.0" />
3434

3535
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
36-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.2" />
36+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
3737

3838
</ItemGroup>
3939

‎frameworks/CSharp/genhttp/benchmark_config.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
"database_os": "Linux",
2424
"display_name": "genhttp [internal]",
2525
"notes": ""
26-
}
27-
},
28-
{
29-
"kestrel": {
26+
},
27+
"kestrel": {
3028
"plaintext_url": "/plaintext",
3129
"json_url": "/json",
3230
"db_url": "/db",
@@ -47,6 +45,6 @@
4745
"database_os": "Linux",
4846
"display_name": "genhttp [kestrel]",
4947
"notes": ""
50-
}
51-
}]
48+
}
49+
}]
5250
}

‎frameworks/PHP/amp/amp.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
88
apt-get install -yqq git unzip wget curl build-essential \
9-
php8.4-cli php8.4-mbstring php8.4-dev php8.4-xml php8.4-curl > /dev/null
9+
php8.5-cli php8.5-mbstring php8.5-dev php8.5-xml php8.5-curl > /dev/null
1010

1111
# An extension is required!
1212
# We deal with concurrencies over 1k, which stream_select doesn't support.
1313
RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar
1414
#RUN apt-get install -y libuv1-dev > /dev/null
1515
RUN apt-get install -y libevent-dev > /dev/null
16-
#RUN pecl install uv-0.2.4 > /dev/null && echo "extension=uv.so" > /etc/php/8.4/cli/conf.d/uv.ini
17-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
16+
#RUN pecl install uv-0.2.4 > /dev/null && echo "extension=uv.so" > /etc/php/8.5/cli/conf.d/uv.ini
17+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1818

1919
WORKDIR /amp
2020
COPY --link . .
21-
COPY deploy/conf/* /etc/php/8.4/cli/conf.d/
21+
COPY deploy/conf/* /etc/php/8.5/cli/conf.d/
2222

2323
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
2424

‎frameworks/PHP/codeigniter/codeigniter.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ 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 > /dev/null
88

99
RUN apt-get update > /dev/null && apt-get install -yqq nginx git unzip \
10-
php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-intl php8.4-curl > /dev/null
10+
php8.5-cli php8.5-fpm php8.5-mysql php8.5-mbstring php8.5-intl php8.5-curl > /dev/null
1111

1212
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1313

14-
COPY deploy/conf/* /etc/php/8.4/fpm/
14+
COPY deploy/conf/* /etc/php/8.5/fpm/
1515

1616
ADD ./ /codeigniter
1717
WORKDIR /codeigniter
1818

19-
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;
19+
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;
2020

2121
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev
2222
#--quiet
@@ -25,5 +25,5 @@ RUN chmod -R 777 writable
2525

2626
EXPOSE 8080
2727

28-
CMD service php8.4-fpm start && \
28+
CMD service php8.5-fpm start && \
2929
nginx -c /codeigniter/deploy/nginx.conf

‎frameworks/PHP/comet/app.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
$app->init(
2525
function() {
2626
ORM::init();
27-
Storage::$date = gmdate(DATE_RFC7231);
27+
Storage::$date = gmdate('D, d M Y H:i:s \G\M\T');
2828
Timer::add(1, function() {
29-
Storage::$date = gmdate(DATE_RFC7231);
29+
Storage::$date = gmdate('D, d M Y H:i:s \G\M\T');
3030
});
3131
});
3232

‎frameworks/PHP/comet/comet-mysql.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
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 > /dev/null
88

9-
RUN apt-get install -yqq php8.3-cli php8.3-xml php8.3-mysql php8.3-mbstring > /dev/null
9+
RUN apt-get install -yqq php8.5-cli php8.5-xml php8.5-mysql php8.5-mbstring > /dev/null
1010

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

13-
RUN apt-get install -y php-pear php8.3-dev libevent-dev git > /dev/null
14-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
13+
RUN apt-get install -y php-pear php8.5-dev libevent-dev git > /dev/null
14+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1515

16-
COPY php.ini /etc/php/8.3/cli/php.ini
16+
COPY php.ini /etc/php/8.5/cli/php.ini
1717

1818
ADD ./ /comet
1919
WORKDIR /comet

‎frameworks/PHP/comet/comet.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
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 > /dev/null
88

9-
RUN apt-get install -yqq php8.4-cli php8.4-pgsql php8.4-xml php8.4-mbstring > /dev/null
9+
RUN apt-get install -yqq php8.5-cli php8.5-pgsql php8.5-xml php8.5-mbstring > /dev/null
1010

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

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

16-
COPY php.ini /etc/php/8.4/cli/php.ini
16+
COPY php.ini /etc/php/8.5/cli/php.ini
1717

1818
ADD ./ /comet
1919
WORKDIR /comet

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

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

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

1212
WORKDIR /flight
1313
COPY . .
@@ -16,8 +16,8 @@ ENV FLIGHT_DIR="/flight/src"
1616

1717
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1818

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

2222
RUN composer require joanhey/adapterman:^0.7
2323
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet

‎frameworks/PHP/flight/flight.dockerfile‎

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

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

1212
WORKDIR /flight
1313
COPY --link . .
@@ -18,11 +18,11 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1818

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

21-
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;
21+
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;
2222

2323
RUN chmod -R 777 /flight
2424

2525
EXPOSE 8080
2626

27-
CMD service php8.4-fpm start && \
27+
CMD service php8.5-fpm start && \
2828
nginx -c /flight/deploy/nginx.conf

0 commit comments

Comments
 (0)