From 67eb2088f0108ebd006449b6330052abaf368360 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 22 Feb 2023 10:52:42 +0000 Subject: [PATCH] Update file docker.yml --- build/docker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/docker.yml b/build/docker.yml index c7a85f4..ba9dfbd 100644 --- a/build/docker.yml +++ b/build/docker.yml @@ -3,8 +3,8 @@ image: name: gcr.io/kaniko-project/executor:v1.9.1-debug entrypoint: [""] - before_script: - - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json + #before_script: + # - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json script: - /kaniko/executor --context "${CI_PROJECT_DIR}" @@ -24,9 +24,9 @@ docker-build:develop: extends: .docker-build variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE:develop-$CI_COMMIT_SHA + IMAGE_TAG: ${CI_REGISTRY_IMAGE}:develop-${CI_COMMIT_SHA} rules: - - if: $CI_COMMIT_BRANCH == "develop" + - if: ${CI_COMMIT_BRANCH} == "develop" docker-build:latest: @@ -34,12 +34,12 @@ docker-build:latest: variables: IMAGE_TAG: ${CI_REGISTRY_IMAGE}:latest rules: - - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master" + - if: ${CI_COMMIT_BRANCH} == "main" || ${CI_COMMIT_BRANCH} == "master" 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 + - if: ${CI_PIPELINE_SOURCE} == "merge_request_event" \ No newline at end of file