hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 04:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'dspacesolr' build issues in GitHub actions by adding 'solrconfig' as an additional_context

Browse Source
This commit is contained in:
Tim Donohue
2024-02-02 10:09:08 -06:00
parent 5f9565e267
commit 8fb4dd5954
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker.yml vendored
View File

@@ -102,6 +102,8 @@ jobs:
build_id: dspace-solr build_id: dspace-solr
image_name: dspace/dspace-solr image_name: dspace/dspace-solr
dockerfile_path: ./dspace/src/main/docker/dspace-solr/Dockerfile dockerfile_path: ./dspace/src/main/docker/dspace-solr/Dockerfile
# Must pass solrconfigs to the Dockerfile so that it can find the required Solr config files
dockerfile_additional_contexts: 'solrconfigs=./dspace/solr/'
secrets: secrets:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}

10
.github/workflows/reusable-docker-build.yml vendored
View File

@@ -24,6 +24,12 @@ on:
dockerfile_context: dockerfile_context:
required: false required: false
type: string type: string
default: '.'
# Optionally a list of "additional_contexts" to pass to Dockerfile. Defaults to empty
dockerfile_additional_contexts:
required: false
type: string
default: ''
# If Docker image should have additional tag flavor details (e.g. a suffix), it may be passed in. # If Docker image should have additional tag flavor details (e.g. a suffix), it may be passed in.
tags_flavor: tags_flavor:
required: false required: false
@@ -123,7 +129,9 @@ jobs:
id: docker_build id: docker_build
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: ${{ inputs.dockerfile_context || '.' }} build-contexts: |
${{ inputs.dockerfile_additional_contexts }}
context: ${{ inputs.dockerfile_context }}
file: ${{ inputs.dockerfile_path }} file: ${{ inputs.dockerfile_path }}
platforms: ${{ matrix.arch }} platforms: ${{ matrix.arch }}
# For pull requests, we run the Docker build (to ensure no PR changes break the build), # For pull requests, we run the Docker build (to ensure no PR changes break the build),