Commit 705f95ba authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/template/functional-unit-template!2
parents 18559665 23af4bef

README.md

+2 −2
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
| Commands test coverage | [![coverage report](https://gitlab.com/redmic-project/server/template/badges/master/coverage.svg?job=maven-build-commands)](https://gitlab.com/redmic-project/server/template/commits/master) | [![coverage report](https://gitlab.com/redmic-project/server/template/badges/dev/coverage.svg?job=maven-build-commands)](https://gitlab.com/redmic-project/server/template/commits/dev) |

| View test coverage | [![coverage report](https://gitlab.com/redmic-project/server/template/badges/master/coverage.svg?job=maven-build-view)](https://gitlab.com/redmic-project/server/template/commits/master) | [![coverage report](https://gitlab.com/redmic-project/server/template/badges/dev/coverage.svg?job=maven-build-view)](https://gitlab.com/redmic-project/server/template/commits/dev) |



Este proyecto sirve de guía para la creación de una nueva unidad funcional (microservicios `commands` y `view` y `lib` asociada).

Este proyecto sirve de guía para la creación de una nueva unidad funcional (microservicios `commands` y `view` y `lib` asociada). Una vez hecho clone del proyecto, se aconseja eliminar el directorio .git para limpiar el historial de git y comenzar como un proyecto nuevo.



1. Antes de importar el proyecto, en el fichero `pom.xml`:

	* Reemplazar `template` por el nombre que se le quiere dar a la unidad funcional.

	* Definir la versión de `redmic` (x.y.z) con la más reciente.

	* Definir la versión de Spring deseada.

	* Definir la versión del pom padre de redmic deseada.



2. En los directorios `template-*`:

	* Renombrarlos con el nombre elegido en el `pom.xml`.

deploy/docker-compose.template-commands.tmpl.yml

+10 −0
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ services: 
      - SPRING_KAFKA_CLIENT-ID={{.Service.Name}}-{{.Task.Slot}}

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    volumes:

      - commands-vol:/tmp/kafka
@@ -32,10 +34,18 @@ services: 
        window: 3m



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true

deploy/docker-compose.template-view.tmpl.yml

+10 −0
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ services: 
      - SPRING_KAFKA_CLIENT-ID={{.Service.Name}}-{{.Task.Slot}}

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -q http://localhost:${VIEW_PORT}/api/${UNIT_NAME}/view/actuator/health
@@ -30,10 +32,18 @@ services: 
        window: 3m



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true