Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
flavour: [debian, alpine]
php: ['8.2', '8.3', '8.4']
php: ['8.2', '8.3', '8.4', '8.5']
outputs:
push: ${{ steps.version.outputs.push }}
steps:
Expand All @@ -28,7 +28,7 @@ jobs:
run: |
DOCKER_IMAGE=jakzal/phpqa
VERSION=master
LATEST_PHP_VERSION="8.4"
LATEST_PHP_VERSION="8.5"
LATEST_FLAVOUR="debian"

# jakzal/phpqa:phpX.X-debian, jakzal/phpqa:phpX.X
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
fail-fast: false
matrix:
flavour: [debian, alpine]
php: ['8.2', '8.3', '8.4']
php: ['8.2', '8.3', '8.4', '8.5']
platform: ['linux/arm64','linux/amd64']
include:
- platform: 'linux/arm64'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4

ARG PHP_VERSION=8.4
ARG PHP_VERSION=8.5
ARG TOOLBOX_EXCLUDED_TAGS="exclude-php:${PHP_VERSION}"
ARG TOOLBOX_VERSION="1.104.1"
ARG FLAVOUR="alpine"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MAKEFLAGS += --no-print-directory
PHP_VERSIONS := 8.2 8.3 8.4
PHP_VERSIONS := 8.2 8.3 8.4 8.5
PHP_VERSION ?= $(lastword $(sort $(PHP_VERSIONS)))
COMPOSER_AUTHDIR ?= $(shell composer config --global home)
ifneq ("", "$(COMPOSER_AUTHDIR)")
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Docker hub repository: https://hub.docker.com/r/jakzal/phpqa/
* `1.117.2-php8.2`, `1.117-php8.2`, `php8.2-debian`, `php8.2` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.3`, `1.117-php8.3`, `php8.3-debian`, `php8.3` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.4`, `1.117-php8.4`, `php8.4-debian`, `php8.4` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.5`, `1.117-php8.5`, `php8.5-debian`, `php8.5` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))

### Alpine

Expand All @@ -24,11 +25,12 @@ Docker hub repository: https://hub.docker.com/r/jakzal/phpqa/
* `1.117.2-php8.2-alpine`, `1.117-php8.2-alpine`, `php8.2-alpine` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.3-alpine`, `1.117-php8.3-alpine`, `php8.3-alpine` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.4-alpine`, `1.117-php8.4-alpine`, `php8.4-alpine` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))
* `1.117.2-php8.5-alpine`, `1.117-php8.5-alpine`, `php8.5-alpine` ([Dockerfile](https://github.com/jakzal/phpqa/blob/v1.117.2/Dockerfile))


Updated daily: `latest`, `debian`, `alpine`, `php8.4`, `php8.4-alpine`, etc.
Updated on patch version change: `1.61`, `1.61-php8.4`, `1.61-php8.4-alpine`, etc.
Never updated: `1.61.0`, `1.61.0-php8.4`, `1.61.0-php8.4-alpine`, etc.
Updated daily: `latest`, `debian`, `alpine`, `php8.5`, `php8.5-alpine`, etc.
Updated on patch version change: `1.61`, `1.61-php8.5`, `1.61-php8.5-alpine`, etc.
Never updated: `1.61.0`, `1.61.0-php8.5`, `1.61.0-php8.5-alpine`, etc.

### Legacy

Expand Down