Commit e0b21654 authored by FulcrandG's avatar FulcrandG
Browse files

Fixing docker_build script to handle commit, tag and detached status

parent ebd56f01

jobs/docker_build/docker_build.yml

+15 −17
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ docker: 
    entrypoint: [""]

  variables:

    IMAGE: ""

    DESTINATIONS: "--destination ${IMAGE}"

    COMMIT_CREATE_LATEST: "False"

    TAG_CREATE_LATEST: "True"

  script:

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

    - mkdir -p /kaniko/.docker/

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

    -   if [ ! -z ${CI_COMMIT_SHA} ]; then
@@ -17,16 +17,14 @@ docker: 
    -     IMAGE=${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    -   fi

    - fi

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

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

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

    -   elif [ ${COMMIT_CREATE_LATEST} == "False" ]]

    -     DESTINATIONS="--destination ${IMAGE}"

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

    -   fi

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

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

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

    -   elif [[ ${TAG_CREATE_LATEST} == "False" ]]; then

    -     DESTINATIONS="--destination ${IMAGE}"

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

    -   fi

    -   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 ${IMAGE_TAG} --destination ${CI_REGISTRY_IMAGE}:latest

    - fi

    - 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 ${DESTINATIONS}