Skip to content

Commit

Permalink
Merge pull request #9530 from joanhey/nette-php8.4
Browse files Browse the repository at this point in the history
[php] Nette update to PHP/8.4
  • Loading branch information
msmith-techempower authored Jan 16, 2025
2 parents f56b5fa + 7113d24 commit 4f7f619
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
15 changes: 7 additions & 8 deletions frameworks/PHP/nette/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
"license": ["MIT", "BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
"require": {
"php": ">= 7.2",
"nette/application": "^3.1",
"nette/bootstrap": "^3.1",
"nette/caching": "^3.1",
"nette/database": "^3.1",
"nette/application": "^3.2",
"nette/bootstrap": "^3.2",
"nette/caching": "^3.3",
"nette/database": "^3.2",
"nette/di": "^3.0",
"nette/finder": "^2.5",
"nette/finder": "^3.0",
"nette/forms": "^3.1",
"nette/http": "^3.1",
"nette/mail": "^3.1",
"nette/robot-loader": "^3.3",
"nette/mail": "^4.0",
"nette/security": "^3.1",
"nette/utils": "^3.2",
"nette/utils": "^4.0",
"latte/latte": "^2.11 || ^3.0",
"tracy/tracy": "^2.8"
},
Expand Down
13 changes: 6 additions & 7 deletions frameworks/PHP/nette/nette.dockerfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
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 install -yqq nginx git unzip \
php8.3-fpm php8.3-mysql php8.3-xml php8.3-mbstring php8.3-intl php8.3-dev php8.3-curl > /dev/null
php8.4-fpm php8.4-mysql php8.4-xml php8.4-mbstring php8.4-intl php8.4-dev php8.4-curl > /dev/null

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

ADD ./ /nette
WORKDIR /nette

COPY --link . .
#ENV NETTE_DIR="/nette/src"

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

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

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 chmod -R 777 /nette

EXPOSE 8080

CMD service php8.3-fpm start && \
CMD service php8.4-fpm start && \
nginx -c /nette/deploy/nginx.conf 2>&1 > /dev/stderr

0 comments on commit 4f7f619

Please sign in to comment.