From cb0a0061c82269c53b8ab4e4cf6ee70df3cdd2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=BCckel?= <tobias.lueckel@netlogix.de>
Date: Mon, 10 Aug 2026 11:12:26 +0200
Subject: [PATCH 1/2] fix: use correct Dockerfile

Also build php images if php workflow changes
---
 .github/workflows/php.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 12e7cca7..438c1133 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,11 +12,13 @@ on:
       - main
     paths:
       - php/**
+      - .github/workflows/php.yml
   pull_request:
     branches:
       - main
     paths:
       - php/**
+      - .github/workflows/php.yml
   workflow_dispatch:
     inputs: {}
 
@@ -163,7 +165,7 @@ jobs:
             PHP_VERSION=8.4
             UBUNTU_VERSION=24.04
         - version: 8.5
-          file: 8.x.Dockerfile
+          file: Dockerfile
           build-args: |
             PHP_VERSION=8.5
             UBUNTU_VERSION=26.04

From 1b74b62c6f14093f4556dba5f71921fa530823d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=BCckel?= <tobias.lueckel@netlogix.de>
Date: Mon, 10 Aug 2026 11:37:51 +0200
Subject: [PATCH 2/2] feat: add timeout to prevent endless runs

If there is no docker image ready after 120 minutes, something is wrong
---
 .github/workflows/php.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 438c1133..b9bf3d4e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -83,6 +83,7 @@ jobs:
 
       - name: Build and push (php-fpm)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -97,6 +98,7 @@ jobs:
 
       - name: Build and push (php-cli)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -111,6 +113,7 @@ jobs:
 
       - name: Build and push (php-cron)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -125,6 +128,7 @@ jobs:
 
       - name: Build and push (php-supervisor)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -190,6 +194,7 @@ jobs:
 
       - name: Build and push (php-fpm-dev)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -204,6 +209,7 @@ jobs:
 
       - name: Build and push (php-cli-dev)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php
@@ -218,6 +224,7 @@ jobs:
 
       - name: Build and push (php-cron-dev)
         uses: docker/build-push-action@v7
+        timeout-minutes: 120
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./php