From bebd6d52b8545fa9eefd6661c2fc9fba0e0cbd52 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 12:07:27 +0100 Subject: [PATCH 1/2] Use new gradle image in GHCR now its available Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr-build.yaml | 2 +- dockerfiles/dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3907fba..b39fce0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -102,8 +102,8 @@ jobs: tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} build-args: | - dockerRepository=harbor.galasa.dev - tag=main + dockerRepository=ghcr.io + tag=${{ env.BRANCH }} # Recycle the development Maven registry app in ArgoCD # Authenticate using a token passed in as an environment variable diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index d5803fd..e76e809 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -84,5 +84,5 @@ jobs: load: true tags: maven:test build-args: | - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io tag=main \ No newline at end of file diff --git a/dockerfiles/dockerfile b/dockerfiles/dockerfile index bf62173..013304a 100644 --- a/dockerfiles/dockerfile +++ b/dockerfiles/dockerfile @@ -1,6 +1,6 @@ ARG dockerRepository ARG tag -FROM ${dockerRepository}/galasadev/galasa-gradle:${tag} +FROM ${dockerRepository}/galasa-dev/gradle-maven-artefacts:${tag} COPY repo/ /usr/local/apache2/htdocs/ COPY maven.githash /usr/local/apache2/htdocs/maven.githash \ No newline at end of file From 79b4a0898c517ab72ccc47a8afa69f0851c12671 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 13:22:41 +0100 Subject: [PATCH 2/2] Empty commit for build Signed-off-by: Jade Carino