Commit af8af14e authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'allow-setting-kaniko-context' into 'master' 

fix: use kaniko context to set... well, context

See merge request ci/templates!9
parents 2b9dd6fb 774bd01b

.gitlab-ci.yml

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


docker:kaniko:

  variables:

    CI_PROJECT_DIR: "./templates_tests/python"

    CONTEXT: templates_tests/python



yaml:yamllint:

  allow_failure: true  # for now

docker/kaniko-template.yml

+11 −10
Original line number Diff line number Diff line
@@ -6,11 +6,12 @@ 
  stage: build

  variables:

    USE_CACHE: "true"

    CONTEXT: ${CI_PROJECT_DIR}

    DOCKERFILE: "Dockerfile"  # Can be a path

    DEV_BUILD: "false"  # set true to tag an image for each commit

    LABELS: "--label CI_PROJECT_URL=${CI_PROJECT_URL}

             --label CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA}

             --label CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}"

    LABELS: "--label=CI_PROJECT_URL=${CI_PROJECT_URL}

             --label=CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA}

             --label=CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}"

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

  image:

    name: gcr.io/kaniko-project/executor:debug
@@ -19,20 +20,20 @@ 
    - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"}}}" > /kaniko/.docker/config.json

    - |

      if [ -z "${DESTINATIONS}" ]; then

        DESTINATIONS="--destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"

        DESTINATIONS="--destination=${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"

        if [ "${CI_COMMIT_REF_NAME}" = "master" ]; then

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

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

        fi

      fi

    - |

      if [ "${DEV_BUILD}" = "true" ]; then

        DESTINATIONS="${DESTINATIONS} --destination ${CI_REGISTRY_IMAGE}/dev:${CI_COMMIT_SHORT_SHA}"

        DESTINATIONS="${DESTINATIONS} --destination=${CI_REGISTRY_IMAGE}/dev:${CI_COMMIT_SHORT_SHA}"

      fi

    - printf "Will use the following destinations:${DESTINATIONS}\n" | sed 's/--destination /\n/g'

    - /kaniko/executor --cache=${USE_CACHE} --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/${DOCKERFILE} ${DESTINATIONS} ${LABELS} ${EXTRA_ARGS}

    - /kaniko/executor --cache=${USE_CACHE} --context=${CONTEXT} --dockerfile=${DOCKERFILE} ${DESTINATIONS} ${LABELS} ${EXTRA_ARGS}

    - |

      if [ "${PYTHON_TEST}" = "true" ]; then

        printf "\nRUN if ! python3 -m pip >/dev/null; then wget -q https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py; fi" >> $CI_PROJECT_DIR/$DOCKERFILE

        printf "\nRUN python3 -m pip install pytest pytest-cov pylint pylint_junit safety mutmut coverage" >> ${CI_PROJECT_DIR}/${DOCKERFILE}

        /kaniko/executor --cache=${USE_CACHE} --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/${DOCKERFILE} --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-testing ${EXTRA_ARGS}

        printf "\nRUN if ! python3 -m pip >/dev/null; then wget -q https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py; fi" >> ${CONTEXT}/${DOCKERFILE}

        printf "\nRUN python3 -m pip install pytest pytest-cov pylint pylint_junit safety mutmut coverage" >> ${CONTEXT}/${DOCKERFILE}

        /kaniko/executor --cache=${USE_CACHE} --context=${CONTEXT} --dockerfile=${DOCKERFILE} --destination=${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-testing ${EXTRA_ARGS}

      fi