#IPF Update Grype version

COPRS · May 22, 2024 · 8453f7b · 8453f7b
1 parent 15256dd
commit 8453f7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/actions/build-ipf-container/action.yaml b/.github/actions/build-ipf-container/action.yaml
@@ -44,7 +44,7 @@ runs:
         "ARTIFACTORY_USER=${{ inputs.WERUM_ARTIFACTORY_USER }}"
         "ARTIFACTORY_PASS=${{ inputs.WERUM_ARTIFACTORY_PASSWORD }}"
       build-args: |
-        BRANCH=${{ inputs.BRANCH_NAME }}
+        BRANCH=develop
         BRANCH_TEXT=${{ inputs.BRANCH_NAME }}
         VERSION=${{ env.VERSION }}
         COMMIT_ID=${{ env.COMMIT_ID }}
@@ -55,6 +55,7 @@ runs:
     with:
       image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
       fail-build: false
+      grype-version: v0.77.4
       output-format: json
 
         # DEBUG REPORT NAME

diff --git a/.github/workflows/build-ipf-s1-l1.yaml b/.github/workflows/build-ipf-s1-l1.yaml
@@ -8,7 +8,7 @@ on:
     branches:
       - '!main'
       - 'release/**'
-      - 'develop**'
+      - '*'
   workflow_call:
     secrets:
       WERUM_ARTIFACTORY_USER:

diff --git a/rs-container/docker_s1_ipf_l1/Dockerfile b/rs-container/docker_s1_ipf_l1/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /app
 
 FROM artifactory.coprs.esa-copernicus.eu/rs-docker/rs-core-base:${BRANCH} as base
 
+
 FROM artifactory.coprs.esa-copernicus.eu/cfi/processors/s1_l12:3.8.0-light
 
 ARG VERSION
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@ WORKDIR /app

		FROM artifactory.coprs.esa-copernicus.eu/rs-docker/rs-core-base:${BRANCH} as base


		FROM artifactory.coprs.esa-copernicus.eu/cfi/processors/s1_l12:3.8.0-light

		ARG VERSION
Expand Down