Commit 9b25952d authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch '26-fix-change-target-kaniko-registry-for-dev-tag' into 'beta' 

fix!: change target kaniko registry for dev tag

See merge request just-ci/templates!46
parents 81600b75 d417fdd8

container/kaniko.yml

+5 −5
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ 
# global variable for easy override

variables:

  KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}

  KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/dev

  KANIKO_TAG: ${CI_COMMIT_SHORT_SHA}

  KANIKO_DEV_TAG: dev-${CI_COMMIT_SHORT_SHA}  # allows registry cleanup policy

  KANIKO_DEV_TAG: ${CI_COMMIT_SHORT_SHA}

  KANIKO_CONTEXT: ${CI_PROJECT_DIR}

  KANIKO_DOCKERFILE: "Dockerfile"  # Can be a path

  KANIKO_EXTRA_ARGS: ""  # See https://github.com/GoogleContainerTools/kaniko#additional-flags
@@ -17,12 +18,10 @@ variables: 
  image:

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

    entrypoint: [""]

  variables:

    KANIKO_DEV_TAG: dev-${CI_COMMIT_SHORT_SHA}  # allows registry cleanup policy

  script:

    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json

    - /kaniko/executor --cache=${KANIKO_CACHE} --context=${KANIKO_CONTEXT} --dockerfile=${KANIKO_DOCKERFILE} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_TAG} ${LABELS} ${KANIKO_EXTRA_ARGS}

  rules:

    - /kaniko/executor --cache=${KANIKO_CACHE} --context=${KANIKO_CONTEXT} --dockerfile=${KANIKO_DOCKERFILE} --destination=${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_TAG} ${LABELS} ${KANIKO_EXTRA_ARGS}

  rules:  # rules alter the tag used for the second destination

    # master/main

    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH

      variables:
@@ -34,6 +33,7 @@ variables: 
    # branches

    - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH

      variables:

        KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/branch

        KANIKO_TAG: ${CI_COMMIT_REF_SLUG}



# default for polirepos

pipelines/container/polirepo.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ include: 


# set the project container dev image to the image for all jobs without a job-level default image

image:

  name: ${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}

  name: ${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}

  entrypoint: [""]

tests/pipelines/container/monorepo.yml

+4 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ kaniko:image_A: 
  variables:

    KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_A

    KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/a

    KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/a/dev

    KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_A/Dockerfile



kaniko:image_B:
@@ -18,13 +19,14 @@ kaniko:image_B: 
  variables:

    KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_B

    KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/b

    KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/b/dev

    KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_B/Dockerfile



grype:image_A:

  extends: .grype:monorepo

  variables:

    GRYPE_CONTEXT: a

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/a:${KANIKO_DEV_TAG}

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/a/dev:${KANIKO_DEV_TAG}

  needs: ["kaniko:image_A"]

  allow_failure: false
@@ -32,6 +34,6 @@ grype:image_B: 
  extends: .grype:monorepo

  variables:

    GRYPE_CONTEXT: b

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/b:${KANIKO_DEV_TAG}

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/b/dev:${KANIKO_DEV_TAG}

  needs: ["kaniko:image_B"]

  allow_failure: false

tests/pipelines/container/polirepo.yml

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ include: 
    - local: pipelines/workflow.yml



variables:

    KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/container/polirepo

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/container/polirepo:dev-${CI_COMMIT_SHORT_SHA}

    KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo

    KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo/dev

    GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo/dev:${CI_COMMIT_SHORT_SHA}

    KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/polirepo

    KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/polirepo/Dockerfile

    GRYPE_FAIL_ON_THRESHOLD: ""

tests/pipelines/container/python.yml

+2 −3
Original line number Diff line number Diff line
@@ -6,16 +6,15 @@ include: 


variables:

    KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/python-pep518

    KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/python-pep518/dev

    KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/python/pep518

    KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/python/pep518/Dockerfile



before_script:

    - cd tests/mockup_projects/python/pep518



image: ${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}



grype:

    variables:

        GRYPE_FAIL_ON_THRESHOLD: ""

        GRYPE_IMAGE: ${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}

        GRYPE_IMAGE: ${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}

    allow_failure: false