Skip to content

Commit

Permalink
Merge pull request #9502 from joanhey/yii2-php8.4
Browse files Browse the repository at this point in the history
[php] Yii2 update to PHP8.4
  • Loading branch information
msmith-techempower authored Jan 9, 2025
2 parents fc4e693 + 2e53701 commit 59336c5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion frameworks/PHP/yii2/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"require": {
"yidas/yii2-composer-bower-skip": "~2.0.13",
"yiisoft/yii2": "~2.0.49",
"joanhey/adapterman": "^0.6"
"joanhey/adapterman": "^0.7"
},
"config": {
"allow-plugins": {
Expand Down
2 changes: 1 addition & 1 deletion frameworks/PHP/yii2/deploy/conf/cli-php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ memory_limit = 512M
opcache.jit_buffer_size=128M
opcache.jit=tracing

disable_functions=header,header_remove,headers_sent,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,set_time_limit
disable_functions=header,header_remove,headers_sent,headers_list,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,session_unset,session_get_cookie_params,session_set_cookie_params,set_time_limit
12 changes: 6 additions & 6 deletions frameworks/PHP/yii2/yii2-workerman.dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
RUN apt-get update -yqq > /dev/null && \
apt-get install -yqq git php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml > /dev/null
apt-get install -yqq git php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml > /dev/null

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

RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini

COPY deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
COPY deploy/conf/cli-php.ini /etc/php/8.4/cli/php.ini

ADD ./ /yii2
WORKDIR /yii2
COPY --link . .

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

Expand Down
12 changes: 6 additions & 6 deletions frameworks/PHP/yii2/yii2.dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
RUN apt-get update -yqq > /dev/null && \
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
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

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

COPY deploy/conf/* /etc/php/8.3/fpm/
COPY deploy/conf/* /etc/php/8.4/fpm/

ADD ./ /yii2
WORKDIR /yii2
COPY --link . .

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;
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;

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

EXPOSE 8080

CMD service php8.3-fpm start && \
CMD service php8.4-fpm start && \
nginx -c /yii2/deploy/nginx.conf

0 comments on commit 59336c5

Please sign in to comment.