From 705e42b2848ecbb7b82389cc6756d706af1654b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Sun, 5 Nov 2023 19:35:31 +0100 Subject: [PATCH] Update documentation and container images to PHP 8.3 --- .github/workflows/ci.yml | 6 +++--- docs/best-practices/deployment.md | 10 +++++----- tests/Dockerfile-basics | 2 +- tests/Dockerfile-production | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c90ef47..9b91059 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: - uses: actions/checkout@v4 - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 - 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) @@ -116,7 +116,7 @@ jobs: strategy: matrix: php: - - 8.3-rc + - 8.3 - 8.2 - 8.1 - 8.0 @@ -141,7 +141,7 @@ jobs: strategy: matrix: php: - - 8.3-rc + - 8.3 - 8.2 - 8.1 - 8.0 diff --git a/docs/best-practices/deployment.md b/docs/best-practices/deployment.md index 2932b64..8008e27 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.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" +$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.3-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.2/cli/php.ini +$ sudoedit /etc/php/8.3/cli/php.ini ``` -```diff title="/etc/php/8.2/cli/php.ini" +```diff title="/etc/php/8.3/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.2-cli + FROM php:8.3-cli WORKDIR /app/ COPY public/ public/ @@ -541,7 +541,7 @@ 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.2-alpine + FROM php:8.3-alpine # recommended: install optional extensions ext-ev and ext-sockets RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \ diff --git a/tests/Dockerfile-basics b/tests/Dockerfile-basics index ad7c0fe..270aa38 100644 --- a/tests/Dockerfile-basics +++ b/tests/Dockerfile-basics @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM php:8.2-cli +FROM php:8.3-cli WORKDIR /app/ COPY public/ public/ diff --git a/tests/Dockerfile-production b/tests/Dockerfile-production index fbe82c5..ccf3b48 100644 --- a/tests/Dockerfile-production +++ b/tests/Dockerfile-production @@ -8,7 +8,7 @@ COPY composer.json composer.lock ./ # dev environment already has dependencies installed: COPY vendor/ vendor/ -FROM php:8.2-alpine +FROM php:8.3-alpine # recommended: install optional extensions ext-ev and ext-sockets RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \