Skip to content

Commit

Permalink
Update documentation and container images to PHP 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
clue committed Nov 22, 2024
1 parent 7ec78b0 commit debd3eb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
- run: composer install -d tests/integration/
- run: docker build -f tests/integration/${{ matrix.dockerfile }} tests/integration/
- run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1)
Expand All @@ -127,7 +127,7 @@ jobs:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
- run: composer install -d tests/integration/
- run: docker build -f tests/integration/Dockerfile-basics tests/integration/
- run: docker run -d -p 8080:8080 -v "$PWD/composer.json":/app/composer.json $(docker images -q | head -n1)
Expand Down
10 changes: 5 additions & 5 deletions docs/best-practices/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,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.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"
$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.4-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
Expand Down Expand Up @@ -313,10 +313,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.3/cli/php.ini
$ sudoedit /etc/php/8.4/cli/php.ini
```

```diff title="/etc/php/8.3/cli/php.ini"
```diff title="/etc/php/8.4/cli/php.ini"
- memory_limit = 128M
+ memory_limit = -1
```
Expand Down Expand Up @@ -552,7 +552,7 @@ be achieved by using a `Dockerfile` with the following contents:

```docker title="Dockerfile"
# syntax=docker/dockerfile:1
FROM php:8.3-cli
FROM php:8.4-cli

WORKDIR /app/
COPY public/ public/
Expand All @@ -574,7 +574,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.3-alpine
FROM php:8.4-alpine

# recommended: install optional extensions ext-ev and ext-sockets
RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Dockerfile-basics
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM php:8.3-cli
FROM php:8.4-cli

WORKDIR /app/
COPY public/ public/
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Dockerfile-production
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY composer.json composer.lock ./
# dev environment already has dependencies installed:
COPY vendor/ vendor/

FROM php:8.3-alpine
FROM php:8.4-alpine

# recommended: install optional extensions ext-ev and ext-sockets
RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \
Expand Down

0 comments on commit debd3eb

Please sign in to comment.