Commit 64ace837 authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch 'rhtenhove-main-patch-25033' into 'main' 

fix: kaniko failure in pods

See merge request just-ci/templates!64
parents eb5d9db2 2ad9f0ad

container/kaniko.yml

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ variables: 
  KANIKO_DEV_TAG: dev-${CI_COMMIT_SHORT_SHA}  # allows registry cleanup policy

  KANIKO_CONTEXT: ${CI_PROJECT_DIR}

  KANIKO_DOCKERFILE: "Dockerfile"  # Can be a path

  KANIKO_DEFAULT_ARGS: "--force"

  KANIKO_EXTRA_ARGS: ""  # See https://github.com/GoogleContainerTools/kaniko#additional-flags

  KANIKO_CACHE: "true"
@@ -21,7 +22,7 @@ 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}

    - /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_DEFAULT_ARGS} ${KANIKO_EXTRA_ARGS}

  rules:

    # master/main

    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH