diff --git a/.github/workflows/build_php.yml b/.github/workflows/build_php.yml index d9efcc1..b7ba509 100644 --- a/.github/workflows/build_php.yml +++ b/.github/workflows/build_php.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["7.4", "8.0", "8.1", "8.2", "8.3"] variant: [cli, fpm] steps: - uses: actions/checkout@v4 @@ -130,7 +130,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["7.4", "8.0", "8.1", "8.2", "8.3"] variant: [fpm-wkhtmltopdf, cli-wkhtmltopdf] steps: - uses: actions/checkout@v4 @@ -241,7 +241,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["7.4", "8.0", "8.1", "8.2", "8.3"] variant: [caddy, caddy-wkhtmltopdf] steps: - uses: actions/checkout@v4 @@ -352,7 +352,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["7.4", "8.0", "8.1", "8.2", "8.3"] variant: [nginx, nginx-wkhtmltopdf] steps: - uses: actions/checkout@v4 @@ -462,7 +462,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["7.4", "8.0", "8.1", "8.2", "8.3"] variant: [apache, apache-wkhtmltopdf] steps: - uses: actions/checkout@v4 @@ -573,7 +573,7 @@ jobs: strategy: fail-fast: false matrix: - php_version: ["7.4", "8.0", "8.1", "8.2"] + php_version: ["7.4", "8.0", "8.1", "8.2", "8.3"] node_version: ["14", "16", "18", "19"] variant: [apache, apache-wkhtmltopdf, caddy, caddy-wkhtmltopdf, nginx, nginx-wkhtmltopdf] steps: diff --git a/php/Dockerfile.caddy b/php/Dockerfile.caddy index e02e490..351821e 100755 --- a/php/Dockerfile.caddy +++ b/php/Dockerfile.caddy @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 ARG PHP_VERSION -ARG CADDY_VERSION="2.7.4" +ARG CADDY_VERSION="2.7.6" FROM caddy:${CADDY_VERSION}-builder-alpine AS caddy-builder RUN xcaddy build \ - --with github.com/dunglas/mercure \ --with github.com/dunglas/mercure/caddy + FROM adeliom/php:${PHP_VERSION}-fpm RUN set -eux; \ diff --git a/php/Dockerfile.caddy-wkhtmltopdf b/php/Dockerfile.caddy-wkhtmltopdf index e6a2cde..5539e11 100755 --- a/php/Dockerfile.caddy-wkhtmltopdf +++ b/php/Dockerfile.caddy-wkhtmltopdf @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 ARG PHP_VERSION -ARG CADDY_VERSION="2.7.4" +ARG CADDY_VERSION="2.7.6" FROM caddy:${CADDY_VERSION}-builder-alpine AS caddy-builder RUN xcaddy build \ - --with github.com/dunglas/mercure \ --with github.com/dunglas/mercure/caddy + FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf RUN set -eux; \