|
74 | 74 | type=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.type' ./visyn_product.json) |
75 | 75 | directory=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.directory' ./visyn_product.json) |
76 | 76 | ecr_repo=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.ecr_repo' ./visyn_product.json) |
| 77 | + dockerfile_in_app=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.dockerfile_in_app' ./visyn_product.json) |
77 | 78 | app=$(jq -rc '.app' ./visyn_product.json) |
78 | 79 | repo=$(jq -rc '.repo' ./visyn_product.json) |
79 | 80 | branch=$(jq -rc '.branch' ./visyn_product.json) |
|
87 | 88 | echo "type=$type" |
88 | 89 | echo "directory=$directory" |
89 | 90 | echo "ecr_repo=$ecr_repo" |
| 91 | + echo "dockerfile_in_app=$dockerfile_in_app" |
90 | 92 | echo "app=$app" |
91 | 93 | echo "repo=$repo" |
92 | 94 | echo "branch=$branch" |
|
97 | 99 | echo "type=$type" >> "$GITHUB_OUTPUT" |
98 | 100 | echo "directory=$directory" >> "$GITHUB_OUTPUT" |
99 | 101 | echo "ecr_repo=$ecr_repo" >> "$GITHUB_OUTPUT" |
| 102 | + echo "dockerfile_in_app=$dockerfile_in_app" >> "$GITHUB_OUTPUT" |
100 | 103 | echo "app=$app" >> "$GITHUB_OUTPUT" |
101 | 104 | echo "repo=$repo" >> "$GITHUB_OUTPUT" |
102 | 105 | echo "branch=$branch" >> "$GITHUB_OUTPUT" |
@@ -224,7 +227,7 @@ jobs: |
224 | 227 | aws_region: ${{ vars.DV_AWS_REGION }} |
225 | 228 | ecr_registry: ${{ vars.DV_AWS_ECR_REGISTRY }} |
226 | 229 | ecr_repository: ${{ steps.get-parameters.outputs.ecr_repo }} |
227 | | - docker_file: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }}/docker/Dockerfile |
| 230 | + docker_file: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }}/${{ steps.get-parameters.outputs.dockerfile_in_app || 'docker/Dockerfile' }} |
228 | 231 | current_directory: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }} |
229 | 232 | image_tag: ${{ inputs.image_tag1 }} |
230 | 233 | build_args: | |
|
0 commit comments