Commit 8f9e30a8 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch... 

Merge branch '394-check-cve-caught-by-trivy-scan-and-identify-a-way-to-fix-the-critical-one' into 'latest'

Resolve "Check CVE caught by trivy scan and identify a way to fix the Critical one"

Closes #394

See merge request r2devops/hub!228
parents 638bc00a 4c8ce324

jobs/gulp/gulp.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
gulp:

  stage: others

  image:

    name: node:15.7-buster

    name: node:15.14-buster

    entrypoint: [""]

  variables:

    PROJECT_ROOT: "."

jobs/gulp/job.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ icon: 💡 
maintainer: coconux

license: MIT

images:

  "node": "15.7-buster"

  "node": "15.14-buster"

tools:

  "Gulp": "$GULP_VERSION"

labels:

jobs/gulp/versions/0.2.0.md

0 → 100644
+1 −0
Original line number Diff line number Diff line 
* Upgrade image `node` from `15.7` to `15.14`

jobs/newman/job.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ icon: 🚀 
maintainer: FulcrandG

license: MIT

images:

  "node": "15.4.0"

  "node": "15.14-buster"

tools:

  "newman": "latest"

labels:

jobs/newman/newman.yml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ stages: 
  - dynamic_tests



newman:

  image: node:15.12.0

  image: node:15.14-buster

  stage: dynamic_tests

  variables:

    NEWMAN_COLLECTION: "postman_collection.json"
@@ -17,13 +17,13 @@ newman: 
  script:

    - npm install -g newman@${NEWMAN_VERSION} newman-reporter-junitfull@${NEWMAN_JUNIT_VERSION}

    - if [[ ! -z ${NEWMAN_ENVIRONMENT_FILE} ]]; then

    -   NEWMAN_ADDITIONAL_OPTIONS+=" -e ${NEWMAN_ENVIRONMENT_FILE}"

    -   export NEWMAN_ADDITIONAL_OPTIONS="${NEWMAN_ADDITIONAL_OPTIONS} -e ${NEWMAN_ENVIRONMENT_FILE}"

    - fi

    - if [[ ! -z ${NEWMAN_GLOBALS_FILE} ]]; then

    -   NEWMAN_ADDITIONAL_OPTIONS+=" -g ${NEWMAN_GLOBALS_FILE}"

    -   export NEWMAN_ADDITIONAL_OPTIONS="${NEWMAN_ADDITIONAL_OPTIONS} -g ${NEWMAN_GLOBALS_FILE}"

    - fi

    - if [[ ! ${NEWMAN_FAIL_ON_ERROR} == "true" ]]; then

    -   NEWMAN_ADDITIONAL_OPTIONS+=" --suppress-exit-code"

    -   export NEWMAN_ADDITIONAL_OPTIONS="${NEWMAN_ADDITIONAL_OPTIONS} --suppress-exit-code"

    - fi

    - |

      newman run ${NEWMAN_COLLECTION} -r cli,junitfull \