Skip to content

Commit 692621c

Browse files
authored
Merge pull request #40 from datavisyn/dockerfile_in_app
feat: Allow building Dockerfiles from app in standalone mode
2 parents 178e125 + 8e96a4f commit 692621c

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

.github/workflows/build-single-product-part.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ jobs:
7474
type=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.type' ./visyn_product.json)
7575
directory=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.directory' ./visyn_product.json)
7676
ecr_repo=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.ecr_repo' ./visyn_product.json)
77+
skip_image_check=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.skip_image_check' ./visyn_product.json)
78+
dockerfile_in_app=$(jq --arg var "${COMPONENT}" -rc '.components | to_entries | .[] | select(.key==$var)| .value.dockerfile_in_app' ./visyn_product.json)
79+
if [ "$dockerfile_in_app" == "null" ]; then
80+
dockerfile_in_app=docker/Dockerfile
81+
fi
7782
app=$(jq -rc '.app' ./visyn_product.json)
7883
repo=$(jq -rc '.repo' ./visyn_product.json)
7984
branch=$(jq -rc '.branch' ./visyn_product.json)
@@ -87,6 +92,8 @@ jobs:
8792
echo "type=$type"
8893
echo "directory=$directory"
8994
echo "ecr_repo=$ecr_repo"
95+
echo "dockerfile_in_app=$dockerfile_in_app"
96+
echo "skip_image_check=$skip_image_check"
9097
echo "app=$app"
9198
echo "repo=$repo"
9299
echo "branch=$branch"
@@ -97,6 +104,8 @@ jobs:
97104
echo "type=$type" >> "$GITHUB_OUTPUT"
98105
echo "directory=$directory" >> "$GITHUB_OUTPUT"
99106
echo "ecr_repo=$ecr_repo" >> "$GITHUB_OUTPUT"
107+
echo "dockerfile_in_app=$dockerfile_in_app" >> "$GITHUB_OUTPUT"
108+
echo "skip_image_check=$skip_image_check" >> "$GITHUB_OUTPUT"
100109
echo "app=$app" >> "$GITHUB_OUTPUT"
101110
echo "repo=$repo" >> "$GITHUB_OUTPUT"
102111
echo "branch=$branch" >> "$GITHUB_OUTPUT"
@@ -224,7 +233,7 @@ jobs:
224233
aws_region: ${{ vars.DV_AWS_REGION }}
225234
ecr_registry: ${{ vars.DV_AWS_ECR_REGISTRY }}
226235
ecr_repository: ${{ steps.get-parameters.outputs.ecr_repo }}
227-
docker_file: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }}/docker/Dockerfile
236+
docker_file: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }}/${{ steps.get-parameters.outputs.dockerfile_in_app }}
228237
current_directory: ./tmp/${{ inputs.component }}/${{ steps.get-parameters.outputs.app }}
229238
image_tag: ${{ inputs.image_tag1 }}
230239
build_args: |
@@ -244,6 +253,7 @@ jobs:
244253
org.opencontainers.image.created=${{ inputs.build_time }}
245254
org.opencontainers.image.revision=${{ github.sha }}
246255
- name: scan image
256+
if: ${{ steps.get-parameters.outputs.skip_image_check != 'true' }}
247257
id: get-ecr-scan-result
248258
uses: ./tmp/github-workflows/.github/actions/get-ecr-scan-result
249259
with:
@@ -253,6 +263,7 @@ jobs:
253263
ecr_repository: ${{ steps.get-parameters.outputs.ecr_repo }}
254264
image_tag: ${{ inputs.image_tag1 }}
255265
- name: check scan results
266+
if: ${{ steps.get-parameters.outputs.skip_image_check != 'true' }}
256267
run: |
257268
if [ "${{ steps.get-ecr-scan-result.outputs.critical }}" != "null" ] || [ "${{ steps.get-ecr-scan-result.outputs.high }}" != "null" ]; then
258269
echo "Docker image contains vulnerabilities at critical or high level"

0 commit comments

Comments
 (0)