Skip to content

Commit

Permalink
Add PHP 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
OskarStark committed Jun 10, 2024
1 parent a244af5 commit d8201ac
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 38 deletions.
36 changes: 12 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
ALIAS_VERSION: '8.2'
VERSION_FOR_ALIAS: '8.2.20'
ALIAS_VERSION: '8.3'
VERSION_FOR_ALIAS: '8.3.8'

jobs:
ci:
Expand All @@ -21,27 +21,15 @@ jobs:
strategy:
matrix:
php-version:
- '8.2.20'
- '8.2.19'
- '8.2.18'
- '8.2.17'
- '8.2.16'
- '8.2.15'
- '8.2.14'
- '8.2.13'
- '8.2.12'
- '8.2.11'
- '8.2.10'
- '8.2.9'
- '8.2.8'
- '8.2.7'
- '8.2.6'
- '8.2.5'
- '8.2.4'
- '8.2.3'
- '8.2.2'
- '8.2.1'
- '8.2.0'
- '8.3.8'
- '8.3.7'
- '8.3.6'
- '8.3.5'
- '8.3.4'
- '8.3.3'
- '8.3.2'
- '8.3.1'
- '8.3.0'
steps:
- name: "Checkout code"
uses: actions/checkout@v2
Expand Down Expand Up @@ -87,7 +75,7 @@ jobs:
uses: github/codeql-action/upload-sarif@v1
with:
sarif_file: 'trivy-results.sarif'

- if: contains(github.ref, 'refs/heads/release/')
name: Login to DockerHub
uses: docker/login-action@v1
Expand Down
2 changes: 1 addition & 1 deletion 8.2/Dockerfile → 8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-fpm
FROM php:8.3-fpm

RUN apt-get update && apt-get dist-upgrade -y && echo "Security Update enforced on 2022/04/01"

Expand Down
2 changes: 1 addition & 1 deletion 8.2/Dockerfile-alpine → 8.3/Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2.0-fpm-alpine AS base
FROM php:8.3.0-fpm-alpine AS base

FROM base AS build-base
RUN apk add --no-cache --virtual .phpize-base-deps-configure $PHPIZE_DEPS
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,25 +79,25 @@ xdebug.idekey=${PHP_XDEBUG_IDEKEY}
### Run PHP-FPM Server

```console
$ docker run --rm -p 9000:9000 -v `pwd`:/usr/src/app exozet/php-fpm:8.1.3
$ docker run --rm -p 9000:9000 -v `pwd`:/usr/src/app exozet/php-fpm:8.3.8
```

### Run PHP-CLI

If you want to launch a shell:

```console
$ docker run --rm -it -v `pwd`:/usr/src/app --user "${UID:www-data}:${GROUPS[0]:www-data}" exozet/php-fpm:8.1.3 bash
$ docker run --rm -it -v `pwd`:/usr/src/app --user "${UID:www-data}:${GROUPS[0]:www-data}" exozet/php-fpm:8.3.8 bash
```

If you want to run a php command:

```console
$ docker run --rm -it -v `pwd`:/usr/src/app --user "${UID:www-data}:${GROUPS[0]:www-data}" exozet/php-fpm:5.5.38 php -v
PHP 8.1.3 (cli) (built: Mar 1 2022 19:30:44) (NTS)
PHP 8.3.8 (cli) (built: Mar 1 2022 19:30:44) (NTS)
Copyright (c) The PHP Group
Zend Engine v4.1.3, Copyright (c) Zend Technologies
with Zend OPcache v8.1.3, Copyright (c), by Zend Technologies
with Zend OPcache v8.3.8, Copyright (c), by Zend Technologies
with Xdebug v3.1.2, Copyright (c) 2002-2021, by Derick Rethans
```

Expand All @@ -106,11 +106,11 @@ If you want to run composer:
set ```COMPOSER_VERSION``` to the major version you want to use (default ```COMPOSER_VERSION=2``` )

```console
$ docker run --rm -it -v `pwd`:/usr/src/app exozet/php-fpm:8.1.3 composer --version
$ docker run --rm -it -v `pwd`:/usr/src/app exozet/php-fpm:8.3.8 composer --version
Composer version 1.10.17 2020-10-30 22:31:58
$ docker run --rm -it -e COMPOSER_VERSION=1 -v `pwd`:/usr/src/app exozet/php-fpm:8.1.3 composer --version
$ docker run --rm -it -e COMPOSER_VERSION=1 -v `pwd`:/usr/src/app exozet/php-fpm:8.3.8 composer --version
Composer version 1.10.17 2020-10-30 22:31:58
$ docker run --rm -it -e COMPOSER_VERSION=2 -v `pwd`:/usr/src/app exozet/php-fpm:8.1.3 composer --version
$ docker run --rm -it -e COMPOSER_VERSION=2 -v `pwd`:/usr/src/app exozet/php-fpm:8.3.8 composer --version
Composer version 2.0.7 2020-11-13 17:31:06
```

Expand Down Expand Up @@ -157,7 +157,7 @@ You can define the crontab's content with an environment variable like this:
```yaml
services:
import-data-cron:
image: exozet/php-fpm:8.1.3
image: exozet/php-fpm:8.3.8
command: start-cron
environment:
- 'CRONTAB_USER=www-data'
Expand Down Expand Up @@ -201,7 +201,7 @@ Usage in your `docker-compose.yml`:
```yaml
services:
crontab:
image: exozet/php-fpm:8.1.3
image: exozet/php-fpm:8.3.8
command: start-cron
volumes:
- ./:/usr/src/app
Expand All @@ -214,7 +214,7 @@ cron location with the `CRON_PATH` environment variable:
```yaml
services:
crontab:
image: exozet/php-fpm:8.1.3
image: exozet/php-fpm:8.3.8
command: start-cron
environment:
- CRON_PATH=/usr/src/app/crontabs
Expand All @@ -231,15 +231,15 @@ version: "2.1"
services:
php-cli:
image: exozet/php-fpm:8.1.3-sudo
image: exozet/php-fpm:8.3.8-sudo
volumes:
- ./:/usr/src/app
user: "${UID-www-data}:${GID-www-data}"
entrypoint: bash
depends_on:
- nginx
php-fpm:
image: exozet/php-fpm:8.1.3
image: exozet/php-fpm:8.3.8
volumes:
- ./:/usr/src/app
nginx:
Expand Down

0 comments on commit d8201ac

Please sign in to comment.