From bfccacb19288b2bf2c737af6a8414dae01ef0e2c Mon Sep 17 00:00:00 2001
From: Elijah Duffy <enduffy2014@outlook.com>
Date: Sun, 7 Dec 2025 18:24:08 -0800
Subject: [PATCH] fix image naming & tagging

---
 .github/workflows/build.yml | 19 +++++++++++++------
 README.md                   |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb87252..9183f3a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -127,26 +127,33 @@ jobs:
         run: |
           set -euo pipefail
           DIR="${{ matrix.dir }}"
-          NAME="${DIR#docker/}"                         # e.g. '7.4' or 'nginx'
+          # Ensure DIR is set and use basename to derive a reliable NAME
+          if [[ -z "${DIR}" || "${DIR}" == "." ]]; then
+            echo "matrix.dir is empty or '.'; treating as repo root"
+            DIR='.'
+          fi
+          NAME="$(basename "${DIR}")"                  # e.g. '7.4' or 'nginx'
           SHA=${GITHUB_SHA::7}
 
           # Decide repository and tag scheme:
           # - nginx lane -> gitea.auvem.com/auvem/wordpress-nginx:stable
           # - other lanes (assumed php variants) -> gitea.auvem.com/auvem/wordpress-php-fpm:<version>-stable
           if [[ "${NAME}" == "nginx" ]]; then
-            IMAGE="gitea.auvem.com/auvem/wordpress-nginx"
+            IMAGE="gitea.auvem.com/auvem/wordpress-docker/nginx"
             TAG="stable"
           else
-            IMAGE="gitea.auvem.com/auvem/wordpress-php-fpm"
+            IMAGE="gitea.auvem.com/auvem/wordpress-docker/php-fpm"
             # Extract version like 7.4 or 8.1 from the lane name; otherwise use lane name
-            if [[ "${NAME}" =~ ([0-9]+\.[0-9]+) ]]; then
+            if [[ -n "${NAME}" && "${NAME}" =~ ([0-9]+\.[0-9]+) ]]; then
               VERSION="${BASH_REMATCH[1]}"
               TAG="${VERSION}-stable"
-            elif [[ "${NAME}" =~ ([0-9]+) ]]; then
+            elif [[ -n "${NAME}" && "${NAME}" =~ ([0-9]+) ]]; then
               VERSION="${BASH_REMATCH[1]}"
               TAG="${VERSION}-stable"
-            else
+            elif [[ -n "${NAME}" ]]; then
               TAG="${NAME}-stable"
+            else
+              TAG="stable"
             fi
           fi
 
diff --git a/README.md b/README.md
index aff2a12..dbe6136 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ services:
       - db_data:/var/lib/mysql
 
   php-fpm:
-    image: gitea.auvem.com/auvem/wordpress-php-fpm:7.4-stable
+    image: gitea.auvem.com/auvem/wordpress-docker/php-fpm:7.4-stable
     restart: unless-stopped
     environment:
       WORDPRESS_DB_HOST: db:3306
@@ -84,7 +84,7 @@ services:
       - ./wp_root:/var/www/html:rw
 
   nginx:
-    image: gitea.auvem.com/auvem/wordpress-nginx:stable
+    image: gitea.auvem.com/auvem/wordpress-docker/nginx:stable
     ports:
       - "80:80"
     depends_on: