Commit fb4654eb authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch... 

Merge branch '47-docker-and-trivy-jobs-can-t-be-used-in-merge-train-as-they-redefine-the-rules-for-their-own-jobs' into latest
parents 7ec21b32 6be1256c

jobs/docker/docker.yml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
stages:

  - build



docker:

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  script:

    - 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"



docker_tag:

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  script:

    - 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"

jobs/docker/README.md→jobs/docker_build/README.md

+0 −0

File moved.

View file

jobs/docker_build/docker_build.yml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
docker_build:

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug-v0.20.0

    entrypoint: [""]

  variables:

    CUSTOM_REGISTRY: ""

    REGISTRY_USER: ""

    REGISTRY_PASSWORD: ""

    CUSTOM_TAG: ""

    COMMIT_CREATE_LATEST: "false"

    TAG_CREATE_LATEST: "true"

  script:

    - mkdir -p /kaniko/.docker/

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

    -   echo "{\"auths\":{\"$CUSTOM_REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json

    -   REGISTRY_IMAGE=$CUSTOM_REGISTRY

    - else

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

    -   REGISTRY_IMAGE=$CI_REGISTRY_IMAGE

    - fi



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

    -   IMAGE_TAG=${CI_COMMIT_TAG}

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

    -     OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest"

    -   fi

    - else

    -   IMAGE_TAG=${CI_COMMIT_SHA}

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

    -     OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest"

    -   fi

    - fi



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

    -   /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${CUSTOM_TAG}

    - else

    -   /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${IMAGE_TAG} ${OPTIONAL_TAG}

    - fi

jobs/docker/job.yml→jobs/docker_build/job.yml

+1 −1
Original line number Diff line number Diff line 
name: docker

name: docker_build

description: A ready-to-use docker job to push the image of your project repository to the gitlab registry

default_stage: build

icon: 🐳