From a9054a10b1f4da843e366c1292f9efb066b07f10 Mon Sep 17 00:00:00 2001
From: Matthew Brown <332917+matthewbga@users.noreply.github.com>
Date: Wed, 26 Nov 2025 17:14:42 +0000
Subject: [PATCH] update actions

---
 .github/workflows/build-image.yml | 26 ++++++++++++++++++++++----
 .github/workflows/maven-build.yml |  7 -------
 .github/workflows/push-image.yml  | 30 ++++++++++++++++++++++++------
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 9611633e6..eb26ab448 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -1,5 +1,23 @@
-- name: Build builder image
-  run: docker build -f Dockerfile.build -t petclinic-builder .
+name: Java CI with Maven
 
-# - name: Build runtime image
-#   run: docker build -f Dockerfile.run -t ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }} .
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '25' ]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build builder image
+        run: docker build -f Dockerfile.build -t petclinic-builder .
+
+      # - name: Build runtime image
+      #   run: docker build -f Dockerfile.run -t ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }} .
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 45ad6db1c..740b1129c 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -27,10 +27,3 @@ jobs:
           cache: maven
       - name: Build with Maven Wrapper
         run: ./mvnw -B verify
-
-
-- name: Build builder image
-  run: docker build -f Dockerfile.build -t petclinic-builder .
-
-- name: Build runtime image
-  run: docker build -f Dockerfile.run -t ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }} .
diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 035a52ef9..a4001f60a 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -1,6 +1,24 @@
-- name: Push final image
-  run: |
-    docker push ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }}
-    docker tag ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }} \
-               ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:latest
-    docker push ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:latest
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '25' ]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Push final image
+        run: |
+          docker push ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }}
+          docker tag ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:${{ github.sha }} \
+                    ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:latest
+          docker push ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REPO_PATH }}:latest