From b65007d0189b7670c5c81e0e28a038c4099e3216 Mon Sep 17 00:00:00 2001
From: Jade Carino <carino_jade@yahoo.co.uk>
Date: Thu, 25 Jul 2024 12:01:47 +0100
Subject: [PATCH 1/2] Updating base-image location now its available

Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk>
---
 .github/workflows/build.yaml    |  3 +--
 .github/workflows/pr-build.yaml |  3 +--
 .secrets.baseline               | 13 ++++++++++++-
 dockerfiles/dockerfile.wrapping |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e361b35..8882366 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -106,9 +106,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
             baseVersion=latest
 
       # Recycle the development Maven registry app in ArgoCD
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index d43bf74..42addad 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -98,7 +98,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
             baseVersion=latest
diff --git a/.secrets.baseline b/.secrets.baseline
index fafda2d..58aa740 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -75,7 +75,18 @@
       "name": "TwilioKeyDetector"
     }
   ],
-  "results": {},
+  "results": {
+    ".github/workflows/build.yaml": [
+      {
+        "hashed_secret": "2ef5c1fbcf50a4f18ecf5771534b5f5b88a46e83",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 27,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ]
+  },
   "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,
diff --git a/dockerfiles/dockerfile.wrapping b/dockerfiles/dockerfile.wrapping
index a862b38..e3d180a 100644
--- a/dockerfiles/dockerfile.wrapping
+++ b/dockerfiles/dockerfile.wrapping
@@ -1,6 +1,6 @@
 ARG dockerRepository
 ARG baseVersion
-FROM ${dockerRepository}/galasadev/galasa-base:${baseVersion}
+FROM ${dockerRepository}/galasa-dev/base-image:${baseVersion}
 
 COPY repo/ /usr/local/apache2/htdocs/
 COPY wrapping.githash /usr/local/apache2/htdocs/wrapping.githash
\ No newline at end of file

From 362f38233ef84051b6d56f69b7206555e0515a59 Mon Sep 17 00:00:00 2001
From: Jade Carino <carino_jade@yahoo.co.uk>
Date: Thu, 25 Jul 2024 13:36:03 +0100
Subject: [PATCH 2/2] Updating secrets baseline

Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk>
---
 .secrets.baseline | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 58aa740..fafda2d 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -75,18 +75,7 @@
       "name": "TwilioKeyDetector"
     }
   ],
-  "results": {
-    ".github/workflows/build.yaml": [
-      {
-        "hashed_secret": "2ef5c1fbcf50a4f18ecf5771534b5f5b88a46e83",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 27,
-        "type": "Secret Keyword",
-        "verified_result": null
-      }
-    ]
-  },
+  "results": {},
   "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,