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
30 changes: 27 additions & 3 deletions .github/rulesets/Main.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,39 @@
"do_not_enforce_on_create": false,
"required_status_checks": [
{
"context": "merge (ghcr.io/specsnl/php85) / Merge Images",
"context": "merge (ghcr.io/specsnl/php85) / runtime / Merge Images (runtime)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/apache) / Merge Images",
"context": "merge (ghcr.io/specsnl/php85) / builder / Merge Images (builder)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/frankenphp) / Merge Images",
"context": "merge (ghcr.io/specsnl/php85) / builder_nodejs / Merge Images (builder_nodejs)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/apache) / runtime / Merge Images (runtime)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/apache) / builder / Merge Images (builder)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/apache) / builder_nodejs / Merge Images (builder_nodejs)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/frankenphp) / runtime / Merge Images (runtime)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/frankenphp) / builder / Merge Images (builder)",
"integration_id": 15368
},
{
"context": "merge (ghcr.io/specsnl/php85/frankenphp) / builder_nodejs / Merge Images (builder_nodejs)",
"integration_id": 15368
}
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
build:
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
strategy:
fail-fast: false
matrix:
Expand All @@ -38,7 +38,7 @@ jobs:
dockerfile: ${{ matrix.docker.dockerfile }}

merge:
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
needs: build
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

build:
needs: check
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
strategy:
fail-fast: false
matrix:
Expand All @@ -57,7 +57,7 @@ jobs:
dockerfile: ${{ matrix.docker.dockerfile }}

merge:
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
needs: build
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
build:
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
strategy:
fail-fast: false
matrix:
Expand All @@ -38,7 +38,7 @@ jobs:
dockerfile: ${{ matrix.docker.dockerfile }}

merge:
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
needs: build
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions Taskfile.dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ vars:
DOCKER_REPO: ghcr.io
DOCKER_OWNER: specsnl
# Latatest version of Hadolint: https://hub.docker.com/r/hadolint/hadolint/tags or https://github.com/hadolint/hadolint/releases
HADOLINT_TAG_VERSION: v2.14.0
HADOLINT_TAG_VERSION: v2.15.1
# Latest version of gomplate: https://hub.docker.com/r/hairyhenderson/gomplate/tags or https://github.com/hairyhenderson/gomplate/releases
GOMPLATE_TAG_VERSION: v5.1.0
GOMPLATE_TAG_VERSION: v5.2.0

# env:
# BUILDKIT_PROGRESS: plain
Expand Down
2 changes: 1 addition & 1 deletion apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# check=error=true

# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer

# Latest version of PHP base image: https://hub.docker.com/_/php/tags
FROM php:8.5.11-apache-trixie AS runtime
Expand Down
2 changes: 1 addition & 1 deletion fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# check=error=true

# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer

# Latest version of PHP base image: https://hub.docker.com/_/php/tags
FROM php:8.5.11-fpm-trixie AS runtime
Expand Down
6 changes: 3 additions & 3 deletions frankenphp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# check=error=true

# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer

# Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags
FROM dunglas/frankenphp:1.12.7-php8.5.9-trixie AS runtime
# Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags or https://github.com/php/frankenphp/releases
FROM dunglas/frankenphp:1.12.7-php8.5.11-trixie AS runtime

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion variants/frankenphp.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image_label: FrankenPHP base image
image_url: https://hub.docker.com/r/dunglas/frankenphp/tags
image_url: https://hub.docker.com/r/dunglas/frankenphp/tags or https://github.com/php/frankenphp/releases
is_frankenphp: true
Loading