diff --git a/.github/actions/build-ipf-container/action.yaml b/.github/actions/build-ipf-container/action.yaml index 432893318..167dd3db3 100644 --- a/.github/actions/build-ipf-container/action.yaml +++ b/.github/actions/build-ipf-container/action.yaml @@ -58,9 +58,9 @@ runs: output-format: json # DEBUG REPORT NAME - - name: Inspect action SARIF report - shell: bash - run: cat ${{ steps.scan.outputs.json }} + # - name: Inspect action SARIF report + # shell: bash + # run: cat ${{ steps.scan.outputs.json }} # Deactivate SARIF Report Upload # - name: Upload Anchore scan SARIF report diff --git a/.github/actions/generate-report/action.yaml b/.github/actions/generate-report/action.yaml index e0030fbb6..0077522fb 100644 --- a/.github/actions/generate-report/action.yaml +++ b/.github/actions/generate-report/action.yaml @@ -17,9 +17,9 @@ runs: shell: bash run: | echo "SEVERITY;ID;PACKAGE;VERSION;LINK" > vulnerabilities.csv - cat vulnerabilities.json | jq -r '.matches[] | "\(.vulnerability.severity);\(.vulnerability.id);\(.artifact.name);\(.artifact.version);\(.vulnerability.links[0])"' >> vulnerabilities.csv + cat result.json | jq -r '.matches[] | "\(.vulnerability.severity);\(.vulnerability.id);\(.artifact.name);\(.artifact.version);\(.vulnerability.links[0])"' >> vulnerabilities.csv echo -e '\n\n\n\n\n\n\n\n\n' > vulnerabilities.html - cat vulnerabilities.json | jq -r '.matches[] | ";;;;;"' | tr -s ';' '\n' | sed 's!>

Negligible! style="background-color:#FFFFFF;">

Negligible!g' | sed 's!>

Low! style="background-color:#FFFC9E;">

Low!g' | sed 's!>

Medium! style="background-color:#FE996B;">

Medium!g' | sed 's!>

High! style="background-color:#FD6864;">

High!g' | sed 's!>

Critical! style="background-color:#FE0000;">

Critical!g' >> vulnerabilities.html + cat result.json | jq -r '.matches[] | "

;;;;;"' | tr -s ';' '\n' | sed 's!>

Negligible! style="background-color:#FFFFFF;">

Negligible!g' | sed 's!>

Low! style="background-color:#FFFC9E;">

Low!g' | sed 's!>

Medium! style="background-color:#FE996B;">

Medium!g' | sed 's!>

High! style="background-color:#FD6864;">

High!g' | sed 's!>

Critical! style="background-color:#FE0000;">

Critical!g' >> vulnerabilities.html echo -e '

\n

SEVERITY

ID

PACKAGE

VERSION

\(.vulnerability.severity)

\(.vulnerability.id)

\(.artifact.name)

\(.artifact.version)

\(.vulnerability.severity)

\(.vulnerability.id)

\(.artifact.name)

\(.artifact.version)

' >> vulnerabilities.html - name: Convert HTLM to PDF diff --git a/.github/workflows/build-ipf-s1-l1.yaml b/.github/workflows/build-ipf-s1-l1.yaml index 97cf7e2ef..da5a8684d 100644 --- a/.github/workflows/build-ipf-s1-l1.yaml +++ b/.github/workflows/build-ipf-s1-l1.yaml @@ -9,6 +9,7 @@ on: - '!main' - 'release/**' - 'develop**' + - 'BuildS1L1L2investigation' workflow_call: secrets: WERUM_ARTIFACTORY_USER: diff --git a/.github/workflows/build-ipf-s1-l2.yaml b/.github/workflows/build-ipf-s1-l2.yaml index 0a79748d3..78ce74f54 100644 --- a/.github/workflows/build-ipf-s1-l2.yaml +++ b/.github/workflows/build-ipf-s1-l2.yaml @@ -9,6 +9,7 @@ on: - '!main' - 'release/**' - 'develop**' + - 'BuildS1L1L2investigation' workflow_call: secrets: WERUM_ARTIFACTORY_USER: @@ -72,4 +73,4 @@ jobs: - uses: ./.github/actions/generate-report with: - COMPONENT: ${{ env.IMAGE_NAME }} \ No newline at end of file + COMPONENT: ${{ env.IMAGE_NAME }} diff --git a/rs-container/docker_s1_ipf_l1/Dockerfile b/rs-container/docker_s1_ipf_l1/Dockerfile index 53df2244f..70c0ba014 100644 --- a/rs-container/docker_s1_ipf_l1/Dockerfile +++ b/rs-container/docker_s1_ipf_l1/Dockerfile @@ -4,7 +4,6 @@ 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 diff --git a/rs-container/docker_s1_ipf_l2/Dockerfile b/rs-container/docker_s1_ipf_l2/Dockerfile index c89977d41..7a4b3f58f 100644 --- a/rs-container/docker_s1_ipf_l2/Dockerfile +++ b/rs-container/docker_s1_ipf_l2/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