Move things around a bit.

.github/workflows/php-core.yml

@@ -3,8 +3,8 @@ name: Build PHP Core
 on:
   push:
     paths:
-      - php/php-core
-      - php/Dockerfile.Core
+      - 'php/core/**'
+      - 'php/Dockerfile.Core'
   workflow_run:
     workflows:
       - Build Marshall

.github/workflows/php-flavours.yml

@@ -3,9 +3,9 @@ name: Build PHP Flavours
 on:
   push:
     paths:
-      - 'php/php+apache/**'
-      - 'php/php+cli/**'
-      - 'php/php+nginx/**'
+      - 'php/apache/**'
+      - 'php/cli/**'
+      - 'php/nginx/**'
       - 'php/Dockerfile.Flavours'
   workflow_run:
     workflows:

php/Dockerfile.Core

@@ -3,7 +3,7 @@ FROM benzine/marshall:latest AS php-core
 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
       org.label-schema.vcs-url="https://github.com/benzine-framework/docker"
 ARG PHP_PACKAGES
-COPY php-core/install-report.sh /usr/bin/install-report
+COPY core/install-report.sh /usr/bin/install-report
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
     echo "Acquire::http::No-Cache=true;" > /etc/apt/apt.conf.d/80-no-cache && \