Commit ebd56f01 authored by FulcrandG's avatar FulcrandG
Browse files

Updating docker and trivy jobs to be able to use a custom IMAGE variable

parent f8e34911

jobs/docker_build/docker_build.yml

+15 −12
Original line number Diff line number Diff line
@@ -4,25 +4,28 @@ docker: 
    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  variables:

    IMAGE: ""

    COMMIT_CREATE_LATEST: "False"

    TAG_CREATE_LATEST: "True"

  script:

    - if [ -z ${CI_COMMIT_BRANCH} ]; then

    -   mkdir -p /kaniko/.docker/

    -   if [ -z ${CI_COMMIT_TAG} ]; then

    -     IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    -   else

    -     IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    -   if [ -z ${IMAGE} ]; then

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

    -       IMAGE=${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    -     elif [ ! -z ${CI_COMMIT_TAG} ]; then

    -       IMAGE=${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    -     fi

    -   fi

    -   if [[ ${COMMIT_CREATE_LATEST} == "True" ]]; then

    -     DESTINATIONS="--destionation ${IMAGE_TAG} --destination ${CI_REGISTRY_IMAGE}:latest"

    -   else

    -     DESTINATIONS="--destionation ${IMAGE_TAG}"

    -     DESTINATIONS="--destination ${IMAGE} --destination ${CI_REGISTRY_IMAGE}:latest"

    -   elif [ ${COMMIT_CREATE_LATEST} == "False" ]]

    -     DESTINATIONS="--destination ${IMAGE}"

    -   fi

    -   if [[ ${TAG_CREATE_LATEST} == "True" ]]; then

    -     DESTINATIONS="--destionation ${IMAGE_TAG} --destination ${CI_REGISTRY_IMAGE}:latest"

    -   else

    -     DESTINATIONS="--destionation ${IMAGE_TAG}"

    -     DESTINATIONS="--destination ${IMAGE} --destination ${CI_REGISTRY_IMAGE}:latest"

    -   elif [[ ${TAG_CREATE_LATEST} == "False" ]]; then

    -     DESTINATIONS="--destination ${IMAGE}"

    -   fi

    -   echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

    -   /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${IMAGE_TAG} --destination ${CI_REGISTRY_IMAGE}:latest

jobs/trivy_image/trivy_image.yml

+7 −5
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ trivy: 
      command: ["dockerd-entrypoint.sh"]



  variables:



    IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

    TRIVY_SEVERITY: "LOW,MEDIUM,HIGH,CRITICAL"

    TRIVY_EXIT_CODE: 1
@@ -25,7 +24,6 @@ trivy: 
    TRIVY_IGNORE_UNFIXED: "false"

    TRIVY_DEBUG: "false"





    DOCKER_HOST: tcp://docker:2375

    DOCKER_DRIVER: overlay2

    DOCKER_TLS_CERTDIR: ""
@@ -38,16 +36,20 @@ trivy: 
    TRIVY_QUIET: "false"

    TRIVY_SKIP_UPDATE: "false"





  before_script:

    - wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz

    - tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz

    - wget -O $TEMPLATE_NAME https://github.com/aquasecurity/trivy/raw/v${TRIVY_VERSION}/contrib/junit.tpl

    

    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY



  script:

    - if [ -z ${CI_COMMIT_SHA} ]; then

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

    -   ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $IMAGE

    - elif [ -z ${CI_COMMIT_SHA} ]; then

    -   ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

    - elif [ -z ${CI_COMMIT_TAG} ]; then

    -   ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG

    - fi



  cache: