Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add php 8.3 #64

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add php 8.3 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27bda8
Add missing 8.2 docker pull
pieterocp Jan 25, 2024
1c3bf55
Add in bits for php 8.3 support
pieterocp Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
php-target:
- "cli"
- "fpm"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_push_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
php-target:
- "cli"
- "fpm"
Expand Down
5 changes: 4 additions & 1 deletion php/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Extends the official PHP image with the following PHP extensions:

See [prooph/proophessor-do app](https://github.com/prooph/proophessor-do) for an example.

> Each image has tags for 7.4, 8.0, 8.1 and 8.2
> Each image has tags for 7.4, 8.0, 8.1, 8.2 and 8.3.

There are also PHP ZTS versions.

Expand Down Expand Up @@ -111,6 +111,9 @@ To run Composer use:
$ docker run --rm -it --volume $(pwd):/app prooph/composer:7.4 [your composer command]
```

## Composer with PHP 8.3
Use the following image: `prooph/composer:8.3`.

## Composer with PHP 8.2
Use the following image: `prooph/composer:8.2`.

Expand Down
2 changes: 1 addition & 1 deletion php/m4/php-cli.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`macros.m4')
DONT_CHANGE()

ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3

########
# base #
Expand Down
2 changes: 1 addition & 1 deletion php/m4/php-fpm.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`macros.m4')
DONT_CHANGE()

ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3

########
# base #
Expand Down
2 changes: 1 addition & 1 deletion php/m4/php-zts.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`macros.m4')
DONT_CHANGE()

ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3

########
# base #
Expand Down
10 changes: 10 additions & 0 deletions php/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,44 @@ docker-build:
export PHP_VERSION=8.0; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.1; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.2; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.3; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build

export PHP_VERSION=8.0; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.1; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.2; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.3; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build

export PHP_VERSION=8.0; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.1; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.2; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
export PHP_VERSION=8.3; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build

docker-push:
export PHP_VERSION=8.0; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.1; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.2; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.3; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push

export PHP_VERSION=8.0; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.1; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.2; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.3; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push

export PHP_VERSION=8.0; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.1; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.2; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
export PHP_VERSION=8.3; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push

docker-pull:
docker pull php:8.0-cli-alpine3.16
docker pull php:8.1-cli-alpine3.16
docker pull php:8.2-cli-alpine3.16
docker pull php:8.3-cli-alpine3.16
docker pull php:8.0-fpm-alpine3.16
docker pull php:8.1-fpm-alpine3.16
docker pull php:8.2-fpm-alpine3.16
docker pull php:8.3-fpm-alpine3.16
docker pull php:8.0-zts-alpine3.16
docker pull php:8.1-zts-alpine3.16
docker pull php:8.2-zts-alpine3.16
docker pull php:8.3-zts-alpine3.16
2 changes: 1 addition & 1 deletion php/php-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT MODIFY THIS AUTOGENERATED FILE
# Change it in m4 folder
ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3
########
# base #
########
Expand Down
2 changes: 1 addition & 1 deletion php/php-fpm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT MODIFY THIS AUTOGENERATED FILE
# Change it in m4 folder
ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3
########
# base #
########
Expand Down
2 changes: 1 addition & 1 deletion php/php-zts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT MODIFY THIS AUTOGENERATED FILE
# Change it in m4 folder
ARG ALPINE_VERSION=3.16
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.3
########
# base #
########
Expand Down