Commit 08f883c8 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'release-0.11.0' into 'master' 

Actualiza a release-0.11.0

See merge request redmic-project/server/notification-manager!11
parents a9b4e3f8 f66a6e37

.gitlab-ci.yml

+1 −7
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ stages: 
  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: notification-manager



.docker-build:

  variables:

    DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}
@@ -33,7 +30,4 @@ variables: 


.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
 
    STACK: notification-manager

Dockerfile

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG} 


COPY /dist/*.jar ./



ARG MICROSERVICE_NAME=notification-manager

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}



ARG MICROSERVICE_PORT=8094

ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${MICROSERVICE_PORT}

deploy/docker-compose.dev.yml

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

version: '3.9'



services:

  notification-manager:

deploy/docker-compose.prod.yml

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

version: '3.9'



services:

  notification-manager:

deploy/docker-compose.tmpl.yml

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

version: '3.9'



services:

  notification-manager:
@@ -9,6 +9,7 @@ services: 
      args:

        PARENT_IMAGE_NAME:

        PARENT_IMAGE_TAG:

        MICROSERVICE_NAME:

        MICROSERVICE_PORT:

    environment:

      MICROSERVICE_NAME:
@@ -33,10 +34,6 @@ services: 
    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      labels:

        traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${MICROSERVICE_NAME}

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

      restart_policy:

        delay: ${RESTART_DELAY:-1m}

      update_config: