Merge pull request #78 from galasa-dev/gh-workflow

Updating GH workflows with new base-image location
galasa-dev · Jul 25, 2024 · fdef3bc · fdef3bc
2 parents 526f931 + 362f382
commit fdef3bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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/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