Skip to content

Commit 4da7c59

Browse files
joanheyjoanhey
authored
[php] Symfony update to PHP 8.2 (TechEmpower#7708)
* [php] Symfony update to PHP 8.2 * Show composer log * Update composer.json
1 parent 0e10f1e commit 4da7c59

File tree

5 files changed

+44
-41
lines changed

5 files changed

+44
-41
lines changed

‎frameworks/PHP/symfony/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"ext-ctype": "*",
77
"ext-iconv": "*",
88
"ext-mbstring": "*",
9-
"symfony/console": "^6.0",
10-
"symfony/dotenv": "^6.0",
11-
"symfony/flex": "^2.0",
12-
"symfony/framework-bundle": "^6.0",
13-
"symfony/orm-pack": "^2.1",
14-
"symfony/twig-bundle": "^6.0",
9+
"symfony/console": "^6",
10+
"symfony/dotenv": "^6",
11+
"symfony/flex": "^2",
12+
"symfony/framework-bundle": "^6",
13+
"symfony/orm-pack": "^2",
14+
"symfony/twig-bundle": "^6",
1515
"symfony/yaml": "^6.0",
1616
"joanhey/adapterman": "^0.5"
1717
},

‎frameworks/PHP/symfony/symfony-raw.dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
6-
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
7-
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip curl \
9-
php8.1-cli php8.1-fpm php8.1-mysql \
10-
php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
6+
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 > /dev/null
8+
9+
RUN apt-get install -yqq nginx git unzip curl \
10+
php8.2-cli php8.2-fpm php8.2-mysql \
11+
php8.2-mbstring php8.2-xml php8.2-curl > /dev/null
1112

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

14-
COPY deploy/conf/* /etc/php/8.1/fpm/
15-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
15+
COPY deploy/conf/* /etc/php/8.2/fpm/
16+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.2/fpm/php-fpm.conf ; fi;
1617

1718
WORKDIR /symfony
1819
ADD ./composer.json /symfony/
1920
RUN mkdir -m 777 -p /symfony/var/cache/{dev,prod} /symfony/var/log
20-
RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --no-scripts --quiet
21+
RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --no-scripts
2122
ADD . /symfony
2223
RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --classmap-authoritative
2324
RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
@@ -27,9 +28,9 @@ RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
2728
#RUN sed -i '/PDO::ATTR_STATEMENT_CLASS/d' ./vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
2829

2930
RUN php bin/console cache:clear
30-
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.1/fpm/php.ini
31+
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.2/fpm/php.ini
3132

3233
EXPOSE 8080
3334

34-
CMD service php8.1-fpm start && \
35+
CMD service php8.2-fpm start && \
3536
nginx -c /symfony/deploy/nginx.conf

‎frameworks/PHP/symfony/symfony-swoole.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0
1+
FROM php:8.2-rc-cli
22

33
RUN pecl install swoole > /dev/null && \
44
docker-php-ext-enable swoole
@@ -16,21 +16,21 @@ COPY deploy/swoole/php.ini /usr/local/etc/php/
1616
WORKDIR /symfony
1717
ADD ./composer.json /symfony/
1818
RUN mkdir -m 777 -p /symfony/var/cache/swoole /symfony/var/log
19-
RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --no-scripts --quiet
19+
RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --no-scripts
2020

2121
# downgrade to doctrine-dbal 2.12 => due to a bug in version 2.13
2222
# see https://github.com/doctrine/dbal/issues/4603
23-
RUN composer require doctrine/orm:2.8.5 -W
24-
RUN composer require doctrine/dbal:2.12.x -W
23+
#RUN composer require doctrine/orm:2.8.5 -W
24+
#RUN composer require doctrine/dbal:2.12.x -W
2525

2626
ADD . /symfony
27-
RUN COMPOSER_ALLOW_SUPERUSER=1 composer require "k911/swoole-bundle:^0.9" --no-scripts --ignore-platform-reqs --quiet
27+
RUN COMPOSER_ALLOW_SUPERUSER=1 composer require "k911/swoole-bundle:^0.10" --no-scripts --with-all-dependencies
2828
RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --classmap-authoritative
2929
RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-env swoole
3030

3131
# removes hardcoded option `ATTR_STATEMENT_CLASS` conflicting with `ATTR_PERSISTENT`. Hack not needed when upgrading to Doctrine 3
3232
# see https://github.com/doctrine/dbal/issues/2315
33-
RUN sed -i '/PDO::ATTR_STATEMENT_CLASS/d' ./vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
33+
#RUN sed -i '/PDO::ATTR_STATEMENT_CLASS/d' ./vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
3434

3535
# Force debug=0 because env is not "prod"
3636
ENV APP_DEBUG=0

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@ FROM ubuntu:22.04
33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
6-
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
7-
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq git unzip \
9-
php8.1-cli php8.1-mysql php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
6+
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 > /dev/null
8+
9+
RUN apt-get install -yqq git unzip \
10+
php8.2-cli php8.2-mysql php8.2-mbstring php8.2-xml php8.2-curl > /dev/null
1011

1112
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1213

13-
RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
14-
RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
14+
RUN apt-get install -y php-pear php8.2-dev libevent-dev > /dev/null
15+
RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.2/cli/conf.d/event.ini
1516

1617
EXPOSE 8080
1718

1819
WORKDIR /symfony
1920
ADD ./composer.json /symfony/
2021
RUN mkdir -m 777 -p /symfony/var/cache/{dev,prod} /symfony/var/log
21-
RUN composer install --no-dev --no-scripts --quiet
22+
RUN composer install --no-dev --no-scripts
2223

2324
# downgrade to doctrine-dbal 2.12 => due to a bug in version 2.13
2425
# see https://github.com/doctrine/dbal/issues/4603
@@ -35,6 +36,6 @@ RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
3536

3637
RUN php bin/console cache:clear
3738

38-
COPY deploy/conf/cli-php.ini /etc/php/8.1/cli/php.ini
39+
COPY deploy/conf/cli-php.ini /etc/php/8.2/cli/php.ini
3940

4041
CMD php server.php start

‎frameworks/PHP/symfony/symfony.dockerfile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
6-
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
7-
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip curl \
9-
php8.1-cli php8.1-fpm php8.1-mysql \
10-
php8.1-mbstring php8.1-xml php8.1-curl php8.1-dev > /dev/null
6+
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 > /dev/null
8+
9+
RUN apt-get install -yqq nginx git unzip curl \
10+
php8.2-cli php8.2-fpm php8.2-mysql \
11+
php8.2-mbstring php8.2-xml php8.2-curl php8.2-dev > /dev/null
1112

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

14-
COPY deploy/conf/* /etc/php/8.1/fpm/
15-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
15+
COPY deploy/conf/* /etc/php/8.2/fpm/
16+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.2/fpm/php-fpm.conf ; fi;
1617

1718
WORKDIR /symfony
1819
ADD ./composer.json /symfony/
@@ -33,7 +34,7 @@ RUN COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
3334
#RUN sed -i '/PDO::ATTR_STATEMENT_CLASS/d' ./vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
3435

3536
RUN php bin/console cache:clear
36-
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.1/fpm/php.ini
37+
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.2/fpm/php.ini
3738

38-
CMD service php8.1-fpm start && \
39+
CMD service php8.2-fpm start && \
3940
nginx -c /symfony/deploy/nginx.conf

0 commit comments

Comments
 (0)