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"> - Verify required PostgreSQL extensions are present (created by CNPG initdb). 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') + Verify required PostgreSQL extensions are present (created by CNPG initdb). SELECT 1; 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"> - - - - - - + + + + + +