diff --git a/build/docker.yml b/build/docker.yml index 240b6bb..bf301a2 100644 --- a/build/docker.yml +++ b/build/docker.yml @@ -3,6 +3,8 @@ image: name: gcr.io/kaniko-project/executor:v1.9.1-debug entrypoint: [""] + before_script: + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json script: - /kaniko/executor --context "${CI_PROJECT_DIR}" @@ -22,8 +24,7 @@ docker-build:develop: extends: .docker-build variables: - #IMAGE_TAG: $CI_REGISTRY_IMAGE/develop:$CI_COMMIT_SHORT_SHA - IMAGE_TAG: $CI_REGISTRY_IMAGE/develop:$CI_COMMIT_SHA + IMAGE_TAG: $CI_REGISTRY_IMAGE:develop-$CI_COMMIT_SHA rules: - if: $CI_COMMIT_BRANCH == "develop" @@ -39,6 +40,6 @@ docker-build:latest: docker-build:review: extends: .docker-build variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE/review:$CI_MERGE_REQUEST_IID + IMAGE_TAG: $CI_REGISTRY_IMAGE:review-$CI_MERGE_REQUEST_IID rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" \ No newline at end of file