From 35611af5013fa0ea56b76af42f6f9f628c973500 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Thu, 11 May 2023 12:50:02 +0200 Subject: [PATCH] ci: replace deprecated CI variables for Gitlab 16 --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ee65b80..d99adb4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ image build: - docker:dind script: - export CI_ES_VERSION=$(sed -n '/FROM elasticsearch/p' Dockerfile | cut -d ":" -f 2) - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build -t $CI_REGISTRY_IMAGE:$CI_ES_VERSION . - docker tag $CI_REGISTRY_IMAGE:$CI_ES_VERSION $CI_REGISTRY_IMAGE:latest only: @@ -33,7 +33,7 @@ main: - docker:dind script: - export CI_ES_VERSION=$(sed -n '/FROM elasticsearch/p' Dockerfile | cut -d ":" -f 2) - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build -t $CI_REGISTRY_IMAGE:$CI_ES_VERSION . - docker tag $CI_REGISTRY_IMAGE:$CI_ES_VERSION $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest @@ -48,8 +48,8 @@ develop: services: - docker:dind script: - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME . - - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME only: - develop