From 0da8fe1d929ced24f172287941af50e6148a36bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Tue, 20 Dec 2022 15:05:36 +0100 Subject: [PATCH] Update documentation and container images to PHP 8.2 --- .github/workflows/ci.yml | 6 +++--- docs/best-practices/deployment.md | 14 +++++++------- tests/Dockerfile-basics | 2 +- tests/Dockerfile-production | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b63994..7799c6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: - uses: actions/checkout@v3 - uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 - run: composer install -d tests/install-as-dep/ - run: docker build -f tests/${{ matrix.dockerfile }} tests/install-as-dep/ - run: docker run -d -p 8080:8080 -v "$PWD/examples/index.php":/app/public/index.php -v "$PWD/composer.json":/app/composer.json -v "$PWD/LICENSE":/app/LICENSE -v "$PWD/tests/":/app/tests/ $(docker images -q | head -n1) @@ -107,7 +107,7 @@ jobs: strategy: matrix: php: - - 8.2-rc + - 8.2 - 8.1 - 8.0 - 7.4 @@ -131,7 +131,7 @@ jobs: strategy: matrix: php: - - 8.2-rc + - 8.2 - 8.1 - 8.0 - 7.4 diff --git a/docs/best-practices/deployment.md b/docs/best-practices/deployment.md index 69c915a..2932b64 100644 --- a/docs/best-practices/deployment.md +++ b/docs/best-practices/deployment.md @@ -220,7 +220,7 @@ If you're not already running an Apache server, you can run your X project with Apache in a temporary Docker container like this: ```bash -$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.1-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground" +$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.2-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground" ``` In order to check your web application responds as expected, you can use your @@ -304,10 +304,10 @@ limit to match your concurrency workload. On Ubuntu- or Debian-based systems, you may change your PHP configuration like this: ```bash -$ sudoedit /etc/php/8.1/cli/php.ini +$ sudoedit /etc/php/8.2/cli/php.ini ``` -```diff title="/etc/php/8.1/cli/php.ini" +```diff title="/etc/php/8.2/cli/php.ini" - memory_limit = 128M + memory_limit = -1 ``` @@ -519,7 +519,7 @@ be achieved by using a `Dockerfile` with the following contents: ```docker title="Dockerfile" # syntax=docker/dockerfile:1 - FROM php:8.1-cli + FROM php:8.2-cli WORKDIR /app/ COPY public/ public/ @@ -541,14 +541,14 @@ be achieved by using a `Dockerfile` with the following contents: COPY composer.json composer.lock ./ RUN composer install --no-dev --ignore-platform-reqs --optimize-autoloader - FROM php:8.1-alpine + FROM php:8.2-alpine # recommended: install optional extensions ext-ev and ext-sockets - RUN apk --no-cache add ${PHPIZE_DEPS} libev \ + RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \ && pecl install ev \ && docker-php-ext-enable ev \ && docker-php-ext-install sockets \ - && apk del ${PHPIZE_DEPS} \ + && apk del ${PHPIZE_DEPS} linux-headers \ && echo "memory_limit = -1" >> "$PHP_INI_DIR/conf.d/acme.ini" WORKDIR /app/ diff --git a/tests/Dockerfile-basics b/tests/Dockerfile-basics index dfdb3b8..ad7c0fe 100644 --- a/tests/Dockerfile-basics +++ b/tests/Dockerfile-basics @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM php:8.1-cli +FROM php:8.2-cli WORKDIR /app/ COPY public/ public/ diff --git a/tests/Dockerfile-production b/tests/Dockerfile-production index 325fe83..fbe82c5 100644 --- a/tests/Dockerfile-production +++ b/tests/Dockerfile-production @@ -8,14 +8,14 @@ COPY composer.json composer.lock ./ # dev environment already has dependencies installed: COPY vendor/ vendor/ -FROM php:8.1-alpine +FROM php:8.2-alpine # recommended: install optional extensions ext-ev and ext-sockets -RUN apk --no-cache add ${PHPIZE_DEPS} libev \ +RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \ && pecl install ev \ && docker-php-ext-enable ev \ && docker-php-ext-install sockets \ - && apk del ${PHPIZE_DEPS} \ + && apk del ${PHPIZE_DEPS} linux-headers \ && echo "memory_limit = -1" >> "$PHP_INI_DIR/conf.d/acme.ini" WORKDIR /app/