diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 610d337..d4ba64e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ cache: # ---- TEST stage ---- maven-test: stage: test - image: maven:3.9.9-eclipse-temurin-21 + image: repo.nstart.cloud/maven:3.9.9-eclipse-temurin-21 script: - mvn $MAVEN_CLI_OPTS verify artifacts: @@ -35,7 +35,7 @@ maven-test: # ---- BUILD stage (один общий mvn package для всех 4 jar'ов) ---- maven-package: stage: build - image: maven:3.9.9-eclipse-temurin-21 + image: repo.nstart.cloud/maven:3.9.9-eclipse-temurin-21 script: - mvn $MAVEN_CLI_OPTS package -DskipTests artifacts: @@ -50,8 +50,8 @@ maven-package: # ---- PUBLISH stage (4 image параллельно) ---- .docker-image-template: &docker-image stage: publish - image: docker:27 - services: [docker:27-dind] + image: repo.nstart.cloud/docker:27 + services: ["repo.nstart.cloud/docker:27-dind"] variables: DOCKER_TLS_CERTDIR: "/certs" # registry.k8s.265.nstart.local — internal insecure HTTP registry, без auth diff --git a/ordinis-app/Dockerfile b/ordinis-app/Dockerfile index a1fa1ae..1b80fdb 100644 --- a/ordinis-app/Dockerfile +++ b/ordinis-app/Dockerfile @@ -1,5 +1,5 @@ # Multi-stage build для ordinis-app -FROM maven:3.9.9-eclipse-temurin-21 AS build +FROM repo.nstart.cloud/maven:3.9.9-eclipse-temurin-21 AS build WORKDIR /build COPY pom.xml ./ COPY ordinis-domain ./ordinis-domain @@ -14,7 +14,7 @@ COPY ordinis-migrations ./ordinis-migrations COPY ordinis-app ./ordinis-app RUN mvn -B -pl ordinis-app -am package -DskipTests -FROM eclipse-temurin:21-jre +FROM repo.nstart.cloud/eclipse-temurin:21-jre WORKDIR /app COPY --from=build /build/ordinis-app/target/*.jar /app/app.jar EXPOSE 8080 diff --git a/ordinis-migrations/Dockerfile b/ordinis-migrations/Dockerfile index ec856a2..b19e765 100644 --- a/ordinis-migrations/Dockerfile +++ b/ordinis-migrations/Dockerfile @@ -1,5 +1,5 @@ # Liquibase migration image — запускается Helm pre-upgrade Job (1-shot, без Spring Boot) -FROM liquibase/liquibase:4.27.0 +FROM repo.nstart.cloud/liquibase/liquibase:4.27.0 USER root COPY src/main/resources/db/changelog /liquibase/changelog diff --git a/ordinis-projection-writer/Dockerfile b/ordinis-projection-writer/Dockerfile index 8450175..b726d47 100644 --- a/ordinis-projection-writer/Dockerfile +++ b/ordinis-projection-writer/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.9-eclipse-temurin-21 AS build +FROM repo.nstart.cloud/maven:3.9.9-eclipse-temurin-21 AS build WORKDIR /build COPY pom.xml ./ COPY ordinis-domain ./ordinis-domain @@ -13,7 +13,7 @@ COPY ordinis-migrations ./ordinis-migrations COPY ordinis-projection-writer ./ordinis-projection-writer RUN mvn -B -pl ordinis-projection-writer -am package -DskipTests -FROM eclipse-temurin:21-jre +FROM repo.nstart.cloud/eclipse-temurin:21-jre WORKDIR /app COPY --from=build /build/ordinis-projection-writer/target/*.jar /app/app.jar EXPOSE 8082 diff --git a/ordinis-read-api/Dockerfile b/ordinis-read-api/Dockerfile index eacd80c..7915d08 100644 --- a/ordinis-read-api/Dockerfile +++ b/ordinis-read-api/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.9-eclipse-temurin-21 AS build +FROM repo.nstart.cloud/maven:3.9.9-eclipse-temurin-21 AS build WORKDIR /build COPY pom.xml ./ COPY ordinis-domain ./ordinis-domain @@ -13,7 +13,7 @@ COPY ordinis-migrations ./ordinis-migrations COPY ordinis-read-api ./ordinis-read-api RUN mvn -B -pl ordinis-read-api -am package -DskipTests -FROM eclipse-temurin:21-jre +FROM repo.nstart.cloud/eclipse-temurin:21-jre WORKDIR /app COPY --from=build /build/ordinis-read-api/target/*.jar /app/app.jar EXPOSE 8081