diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf05e47..89c2d1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,42 +4,19 @@ services: - docker:dind stages: - - stop-old - - build app - - build docker - - deploy - + - deploy front + - deploy back stop-job: - stage: stop-old + stage: deploy back only: - master script: - - echo "Stop old container..." + - echo "Остановка старого контейнера" - docker stop my-bar - docker rm my-bar - -maven-build: - image: maven:3.6.3-openjdk-17-slim - stage: build app - script: "mvn -am clean package" - only: - - master - artifacts: - paths: - - target/*.jar - -docker-build: - stage: build docker - only: - - back_release - script: + - echo "Сборка образа докер" - docker build -t my-bar . - -deploy-job: - stage: deploy - script: + - echo "Запуск докер контейнера" - docker run --name my-bar --restart=always -p 8091:8080 -d my-bar - - echo "Deploy complete" - only: - - back_release \ No newline at end of file + - echo "Деплой завершен" \ No newline at end of file diff --git a/pom.xml b/pom.xml index 63917e3..e009fba 100644 --- a/pom.xml +++ b/pom.xml @@ -89,11 +89,11 @@ lombok provided - - org.springframework.kafka - spring-kafka - 3.2.4 - + + + + +