From 4a3c72e94009ae8967617f21b600b40819b26b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B8=D0=BC=D0=B8=D0=BD?= <zimin.an@nstart.space>
Date: Sun, 3 May 2026 22:00:29 +0300
Subject: [PATCH] ci: use 'extends:' instead of YAML <<: anchor merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GitLab CI YAML <<: doesn't deep-merge — per-job 'variables:' overwrites
the anchor's variables block, so DOCKER_HOST/DOCKER_TLS_CERTDIR were
lost and the docker client fell back to default tcp://docker:2375 (no
TLS). 'extends:' merges variables key-by-key, so per-job SVC/DOCKERFILE
add to the base instead of replacing it.
---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 189063e..d40be57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ maven-package:
     expire_in: 1 day
 
 # ─── PUBLISH (Docker images) ───────────────────
-.docker_base: &docker_base
+.docker_base:
   stage: publish
   image: repo.nstart.cloud/library/docker:26
   services:
@@ -88,7 +88,7 @@ maven-package:
   docker push "$IMG:$CI_COMMIT_REF_SLUG"
 
 docker-app:
-  <<: *docker_base
+  extends: .docker_base
   needs: [maven-package]
   variables:
     SVC: ordinis-app
@@ -98,7 +98,7 @@ docker-app:
     - *publish_script
 
 docker-read-api:
-  <<: *docker_base
+  extends: .docker_base
   needs: [maven-package]
   variables:
     SVC: ordinis-read-api
@@ -108,7 +108,7 @@ docker-read-api:
     - *publish_script
 
 docker-projection-writer:
-  <<: *docker_base
+  extends: .docker_base
   needs: [maven-package]
   variables:
     SVC: ordinis-projection-writer
@@ -118,7 +118,7 @@ docker-projection-writer:
     - *publish_script
 
 docker-migrations:
-  <<: *docker_base
+  extends: .docker_base
   needs: [maven-package]
   variables:
     SVC: ordinis-migrations