From 20300e63afba5510a677b018604ffcbb0617d814 Mon Sep 17 00:00:00 2001
From: Jade Carino <carino_jade@yahoo.co.uk>
Date: Thu, 25 Jul 2024 12:06:19 +0100
Subject: [PATCH] Update workflow to use new wrapping image in GHCR

Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk>
---
 .github/workflows/build.yaml    | 3 +--
 .github/workflows/pr-build.yaml | 3 +--
 dockerfiles/dockerfile.gradle   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8047f06..e6ff427 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,9 +71,8 @@ jobs:
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-            # Temporary: dockerRepository will change to ghcr.io once the Wrapping image is available there
           build-args: |
-            dockerRepository=harbor.galasa.dev
+            dockerRepository=ghcr.io
             tag=${{ env.BRANCH }}
 
       # Recycle the development Maven registry app in ArgoCD
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 8c4d1e5..1145644 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -57,7 +57,6 @@ jobs:
           push: false
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          # dockerRepository will change to ghcr.io once the Wrapping image is available there
           build-args: |
-            dockerRepository=harbor.galasa.dev
+            dockerRepository=ghcr.io
             tag=main
\ No newline at end of file
diff --git a/dockerfiles/dockerfile.gradle b/dockerfiles/dockerfile.gradle
index 68f7655..1fc7313 100644
--- a/dockerfiles/dockerfile.gradle
+++ b/dockerfiles/dockerfile.gradle
@@ -1,6 +1,6 @@
 ARG dockerRepository
 ARG tag
-FROM ${dockerRepository}/galasadev/galasa-wrapping:${tag}
+FROM ${dockerRepository}/galasa-dev/wrapping-maven-artefacts:${tag}
 
 COPY repo/ /usr/local/apache2/htdocs/
 COPY gradle.githash /usr/local/apache2/htdocs/gradle.githash
\ No newline at end of file