From 875380ca97b25aedf502502a9f417950fb5931d1 Mon Sep 17 00:00:00 2001
From: Jade Carino <carino_jade@yahoo.co.uk>
Date: Tue, 23 Jul 2024 15:45:29 +0100
Subject: [PATCH] First attempt at running workflow with current development
 maven repos

Signed-off-by: Jade Carino <carino_jade@yahoo.co.uk>
---
 .github/workflows/pr-build.yaml | 19 +++++++++++++++----
 dockerfiles/dockerfile.gradle   |  6 ++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 dockerfiles/dockerfile.gradle

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 36ee7b9..dc466df 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -1,12 +1,13 @@
 name: PR build
 
 on:
-    workflow_dispatch:
-    pull_request:
-        branches: [main]
+  workflow_dispatch:
+  pull_request:
+      branches: [main]
 
 env:
   NAMESPACE: galasa-dev
+  IMAGE_TAG: ${{ github.event.number }}
 
 jobs:
     build-gradle:
@@ -23,6 +24,10 @@ jobs:
                 java-version: '11'
                 distribution: 'semeru'
 
+            - name: Print githash
+              run: |
+                echo $GITHUB_SHA > ./gradle.githash
+
             - name: Setup Gradle
               uses: gradle/actions/setup-gradle@v3
               with:
@@ -33,4 +38,10 @@ jobs:
                gradle clean build \
                -PsourceMaven=https://repo.maven.apache.org/maven2/ \
                -PcentralMaven=https://repo.maven.apache.org/maven2/ \
-               -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/gradle/
\ No newline at end of file
+               -PtargetMaven=${{ github.workspace }}/repo
+
+            # This Docker image will not be used, it's just to test that the Docker build should work
+            - name: Build and test Gradle image
+              run: |
+                docker build -t gradle-maven-artefacts:${{env.IMAGE_TAG}} --build-arg tag=main --build-arg dockerRepository=harbor.galasa.dev -f dockerfiles/dockerfile.gradle .
+                docker run --rm gradle-maven-artefacts:${{env.IMAGE_TAG}}
\ No newline at end of file
diff --git a/dockerfiles/dockerfile.gradle b/dockerfiles/dockerfile.gradle
new file mode 100644
index 0000000..68f7655
--- /dev/null
+++ b/dockerfiles/dockerfile.gradle
@@ -0,0 +1,6 @@
+ARG dockerRepository
+ARG tag
+FROM ${dockerRepository}/galasadev/galasa-wrapping:${tag}
+
+COPY repo/ /usr/local/apache2/htdocs/
+COPY gradle.githash /usr/local/apache2/htdocs/gradle.githash
\ No newline at end of file