Commit 477b379c authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'release-0.10.0' into 'master' 

release-0.10.0

See merge request redmic-project/server/user!22
parents 952e4cba 4bec3186

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -117,5 +117,3 @@ stages: 
.deploy:

  variables:

    STACK: user
 
  environment:

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

deploy/.env

+3 −0
Original line number Diff line number Diff line
@@ -4,3 +4,6 @@ PARENT_IMAGE_TAG=latest 
MICROSERVICE_NAME=user

MICROSERVICE_PORT=8082

PROPERTY_CONTACTREDMIC=user@example.com



TRAEFIK_ENTRYPOINT=http

TRAEFIK_SUBDOMAIN=user

deploy/docker-compose.dev.yml

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

version: '3.9'



services:

  user:

deploy/docker-compose.prod.yml

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

version: '3.9'



services:

  user:

deploy/docker-compose.tmpl.yml

+7 −4
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  user:
@@ -36,9 +36,12 @@ services: 
      mode: replicated

      replicas: ${REPLICAS:-1}

      labels:

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

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.enable: 'true'



        traefik.http.routers.redmic-user.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.redmic-user.rule: (Host(`${PUBLIC_HOSTNAME}`) || Host(`${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)) && PathPrefix(`/api/${MICROSERVICE_NAME}`)



        traefik.http.services.redmic-user.loadbalancer.server.port: ${MICROSERVICE_PORT}

      restart_policy:

        delay: ${RESTART_DELAY:-1m}

      update_config: