Commit eb650ba2 authored by FulcrandG's avatar FulcrandG
Browse files

Removing rules for docker and trivy jobs

parent ccd381b1

jobs/docker/docker.yml

+10 −10
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ docker: 
    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  script:

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

    -   mkdir -p /kaniko/.docker/

    -   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 $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --destination $CI_REGISTRY_IMAGE:latest

  rules:

    - if: "$CI_COMMIT_BRANCH"

    - fi



docker_tag:

  stage: build
@@ -16,8 +16,8 @@ docker_tag: 
    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  script:

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

    -   mkdir -p /kaniko/.docker/

    -   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 $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG --destination $CI_REGISTRY_IMAGE:latest

  rules:

    - if: "$CI_COMMIT_TAG"
 
    - fi
 
 No newline at end of file

jobs/trivy_image/trivy_image.yml

+4 −7
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ trivy: 


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

  script:

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

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

    - fi



  cache:

    paths:
@@ -59,13 +61,8 @@ trivy: 
    when: always

  dependencies: []



  rules:

    - if: "$CI_COMMIT_BRANCH"



# Run trivy on tag commit

trivy_tag:

  extends: trivy

  variables:

    IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
 
 No newline at end of file
 
  rules:

    - if: "$CI_COMMIT_TAG"