Skip to content

Commit b68edd7

Browse files
authored
Merge pull request #24 from Staffbase/fix-workingdirectory
Fix workingdirectory
2 parents e4a1fec + 49295c7 commit b68edd7

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ inputs:
1919
description: 'Password for the Docker Registry'
2020
required: true
2121
dockerfile:
22-
description: 'Dockerfile'
22+
description: 'Path of the Dockerfile. Should be relative to input.workingdirectory'
2323
required: true
2424
default: './Dockerfile'
2525
dockerbuildargs:
@@ -61,7 +61,7 @@ inputs:
6161
description: 'Files which should be updated by the GitHub Action for PROD'
6262
required: false
6363
workingdirectory:
64-
description: 'The directory (as a path relative to the repo root dir) in which the GitOps action should be executed. The dockerfile variable should be relative to workingdirectory.'
64+
description: 'The path relative to the repo root dir in which the GitOps action should be executed.'
6565
required: false
6666
default: '.'
6767

@@ -127,9 +127,9 @@ runs:
127127
if: inputs.dockerenabled == 'true'
128128
uses: docker/build-push-action@v2
129129
with:
130-
context: .
130+
context: ${{ inputs.workingdirectory }}
131131
push: ${{ steps.preparation.outputs.push }}
132-
file: ${{ inputs.dockerfile }}
132+
file: ${{ inputs.workingdirectory }}/${{ inputs.dockerfile }}
133133
target: ${{ inputs.dockerbuildtarget }}
134134
build-args: ${{ inputs.dockerbuildargs }}
135135
tags: ${{ steps.preparation.outputs.tag_list }}

0 commit comments

Comments
 (0)