Merge branch 'issue-1929-resources-errors' of github.com:galasa-dev/f…

…ramework into issue-1929-resources-errors
galasa-dev · Jul 25, 2024 · 9abbce3 · 9abbce3
2 parents 10c6e13 + 18ffb72
commit 9abbce3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -80,7 +80,7 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           build-args: |
-            dockerRepository=harbor.galasa.dev
+            dockerRepository=ghcr.io
             tag=${{ env.IMAGE_TAG }}
       
       - name: Recycle application in ArgoCD

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -56,7 +56,7 @@ jobs:
           load: true
           tags: framework:test
           build-args: |
-            dockerRepository=harbor.galasa.dev
+            dockerRepository=ghcr.io
             tag=main
 
   build-rest-api-documentation:

diff --git a/dockerfiles/dockerfile.framework b/dockerfiles/dockerfile.framework
@@ -1,6 +1,6 @@
 ARG dockerRepository
 ARG tag
-FROM ${dockerRepository}/galasadev/galasa-maven:${tag}
+FROM ${dockerRepository}/galasa-dev/maven-maven-artefacts:${tag}
 
 COPY repo/ /usr/local/apache2/htdocs/
 COPY framework.githash /usr/local/apache2/htdocs/framework.githash