Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Update workflow to use new wrapping image in GHCR #41

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,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
tag=${{ env.BRANCH }}

# Recycle the development Maven registry app in ArgoCD
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
tag=main
2 changes: 1 addition & 1 deletion dockerfiles/dockerfile.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG dockerRepository
ARG tag
FROM ${dockerRepository}/galasadev/galasa-wrapping:${tag}
FROM ${dockerRepository}/galasa-dev/wrapping-maven-artefacts:${tag}

COPY repo/ /usr/local/apache2/htdocs/
COPY gradle.githash /usr/local/apache2/htdocs/gradle.githash
Loading