From aa26724661384c0e6feeaa5787e3ead0e6c5b09d Mon Sep 17 00:00:00 2001
From: "Zimin A.N." <snaiperlfc@gmail.com>
Date: Sun, 3 May 2026 17:54:30 +0300
Subject: [PATCH] =?UTF-8?q?fix(migrations):=20preConditions=20=D0=94=D0=9E?=
 =?UTF-8?q?=20comment=20=D0=B2=20changelog=20(XSD),=20relative=20include?=
 =?UTF-8?q?=20paths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 0001-extensions.xml: переставил <preConditions> перед <comment> (XSD требует
  preConditions первым в changeSet)
- master.xml: include paths сделаны relative к самому master.xml (changes/...
  вместо db/changelog/changes/...) — CWD inside Docker image это /liquibase,
  Liquibase searchPath = /liquibase/changelog где master.xml лежит, includes
  должны идти от него

CI: insecure-registry: registry.k8s.265.nstart.local (HTTP без auth для
internal cluster), REGISTRY_USER/PASSWORD optional (skip docker login если
не заданы)
---
 .gitlab-ci.yml                                       |  8 +++++++-
 .../db/changelog/changes/0001-extensions.xml         |  2 +-
 .../src/main/resources/db/changelog/master.xml       | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 651c1a1..610d337 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,14 @@ maven-package:
   services: [docker:27-dind]
   variables:
     DOCKER_TLS_CERTDIR: "/certs"
+    # registry.k8s.265.nstart.local — internal insecure HTTP registry, без auth
+    DOCKER_OPTS: "--insecure-registry=registry.k8s.265.nstart.local"
   before_script:
-    - echo "$REGISTRY_PASSWORD" | docker login $REGISTRY -u "$REGISTRY_USER" --password-stdin
+    # Если REGISTRY_USER/PASSWORD заданы — login. Иначе registry без auth (default для internal)
+    - |
+      if [ -n "$REGISTRY_USER" ] && [ -n "$REGISTRY_PASSWORD" ]; then
+        echo "$REGISTRY_PASSWORD" | docker login $REGISTRY -u "$REGISTRY_USER" --password-stdin
+      fi
 
 docker-app:
   <<: *docker-image
diff --git a/ordinis-migrations/src/main/resources/db/changelog/changes/0001-extensions.xml b/ordinis-migrations/src/main/resources/db/changelog/changes/0001-extensions.xml
index dae613a..d7b360e 100644
--- a/ordinis-migrations/src/main/resources/db/changelog/changes/0001-extensions.xml
+++ b/ordinis-migrations/src/main/resources/db/changelog/changes/0001-extensions.xml
@@ -6,7 +6,6 @@
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.27.xsd">
 
   <changeSet id="0001-1-extensions" author="ordinis" runAlways="true">
-    <comment>Verify required PostgreSQL extensions are present (created by CNPG initdb).</comment>
     <preConditions onFail="HALT">
       <sqlCheck expectedResult="t">
         SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'postgis')
@@ -15,6 +14,7 @@
         SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'btree_gist')
       </sqlCheck>
     </preConditions>
+    <comment>Verify required PostgreSQL extensions are present (created by CNPG initdb).</comment>
     <sql>SELECT 1;</sql>
   </changeSet>
 
diff --git a/ordinis-migrations/src/main/resources/db/changelog/master.xml b/ordinis-migrations/src/main/resources/db/changelog/master.xml
index c247420..306b63d 100644
--- a/ordinis-migrations/src/main/resources/db/changelog/master.xml
+++ b/ordinis-migrations/src/main/resources/db/changelog/master.xml
@@ -5,11 +5,11 @@
   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.27.xsd">
 
-  <include file="db/changelog/changes/0001-extensions.xml"/>
-  <include file="db/changelog/changes/0002-dictionary-definitions.xml"/>
-  <include file="db/changelog/changes/0003-dictionary-records.xml"/>
-  <include file="db/changelog/changes/0004-audit-log.xml"/>
-  <include file="db/changelog/changes/0005-outbox-events.xml"/>
-  <include file="db/changelog/changes/0006-idempotency-keys.xml"/>
+  <include file="changes/0001-extensions.xml"/>
+  <include file="changes/0002-dictionary-definitions.xml"/>
+  <include file="changes/0003-dictionary-records.xml"/>
+  <include file="changes/0004-audit-log.xml"/>
+  <include file="changes/0005-outbox-events.xml"/>
+  <include file="changes/0006-idempotency-keys.xml"/>
 
 </databaseChangeLog>