Commit 63fcbac8 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Corrige ruta para comprobar salud del servicio

See merge request redmic-project/server/notification-manager!1
parents f324b744 0fc8722a

.gitlab-ci.yml

+14 −3
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ maven-build: 
  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test

    SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}

    SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}

  only:

    - branches

  cache:
@@ -117,12 +119,15 @@ deploy-dev: 
    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}

    SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME}

      SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -141,12 +146,15 @@ deploy-supporting-branch: 
    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}

    SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME}

      SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -169,12 +177,15 @@ deploy-pro: 
    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}

    SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME}

      SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'



services:

  template:

  notification-manager:

    ports:

      - target: ${MICROSERVICE_PORT}

        published: ${MICROSERVICE_PORT}

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'



services:

  template:

  notification-manager:

    deploy:

      mode: replicated

      replicas: 1

deploy/docker-compose.tmpl.yml

+8 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  template:

  notification-manager:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - MICROSERVICE_NAME

      - MICROSERVICE_PORT

      - SPRING_PROFILES_ACTIVE

      - SPRING_MAIL_USERNAME

      - SPRING_MAIL_PASSWORD

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - traefik-net

      - kafka-net

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health

      test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/api/notification/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3
@@ -20,3 +23,6 @@ services: 
networks:

  traefik-net:

    external: true



  kafka-net:

    external: true

pom.xml

+53 −4
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
		<tomcat.version>8.5.28</tomcat.version>



		<!-- REDMIC -->



		<redmic.broker-lib.version>0.6.0</redmic.broker-lib.version>

		<redmic.test-utils.version>0.6.0</redmic.test-utils.version>

		<!-- OTHERS -->



		<!-- Plugins -->
@@ -39,13 +40,34 @@ 


	<dependencies>



		<!-- Spring, Depende del microservicio. Se podría cambiar por REST, Socket... -->



		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-web</artifactId>

		</dependency>

		

		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-mail</artifactId>

		</dependency>

		

		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-actuator</artifactId>

		</dependency>

		

		<dependency>

		    <groupId>io.micrometer</groupId>

		    <artifactId>micrometer-registry-prometheus</artifactId>

		</dependency>

		

		<!-- Redmic -->



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>broker-lib</artifactId>

			<version>${redmic.broker-lib.version}</version>

		</dependency>



		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>
@@ -56,7 +78,34 @@ 
			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

		</dependency>

		

		<!-- test -->

		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-test</artifactId>

			<scope>test</scope>

		</dependency>

		

		<dependency>

			<groupId>org.springframework.kafka</groupId>

			<artifactId>spring-kafka-test</artifactId>

			<scope>test</scope>

		</dependency>

		

		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>test-utils</artifactId>

			<version>${redmic.test-utils.version}</version>

			<scope>test</scope>

		</dependency>

	</dependencies>

	<repositories>

		<repository>

			<id>confluent</id>

			<name>Confluent</name>

			<url>https://packages.confluent.io/maven/</url>

		</repository>

	</repositories>

	<distributionManagement>

		<repository>

			<id>central</id>
@@ -82,7 +131,7 @@ 
						</goals>

						<configuration>

							<executable>true</executable>

							<finalName>template</finalName>

							<finalName>notification-manager</finalName>

							<outputDirectory>dist</outputDirectory>

						</configuration>

					</execution>