Commit faf96351 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza parámetros de traefik 

Especifica correctamente el dominio por defecto a usar para vincular a
los contenedores, así como su red por defecto (ya no hace falta
definirla en cada uno de los servicios).

Omite timeout de lectura de peticiones.

Incluye red 'traefik-net' en compose, para que se cree dentro del propio
stack. Es posible que cause problemas la primera vez, por conflicto de
nombre con la externa anterior.

Reduce memoria reservada.
parent 603d8721

.gitlab-ci.yml

+4 −6
Original line number Diff line number Diff line
@@ -245,11 +245,11 @@ deploy-traefik-dev: 
    SERVICES_TO_CHECK: traefik_traefik

    IMAGE_TAG: latest

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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - create-nets.sh redmic-net traefik-net

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}

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

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/traefik
@@ -267,13 +267,11 @@ deploy-traefik-pro: 
    SERVICES_TO_CHECK: traefik_traefik

    IMAGE_TAG: latest

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

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

  script:

    - echo "${CERT_FILE}" > "${DEPLOY_DIR_NAME}/certFile.cert"

    - echo "${KEY_FILE}" > "${DEPLOY_DIR_NAME}/keyFile.key"

    - create-nets.sh redmic-net traefik-net

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

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

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/traefik

traefik/.env

0 → 100644
+1 −0
Original line number Diff line number Diff line 
TRAEFIK_NET_NAME=traefik-net

traefik/docker-compose.tmpl.yml

+11 −8
Original line number Diff line number Diff line
@@ -5,22 +5,23 @@ services: 
    image: traefik:${IMAGE_TAG:-latest}

    command:

      - "--api"

      - "--sendAnonymousUsage=true"

      - "--entrypoints=Name:http Address::80"

      - "--defaultentrypoints=http"

      - "--maxIdleConnsPerHost=1000"

      - "--forwardingtimeouts.dialtimeout=15s"

      - "--forwardingtimeouts.responseheadertimeout=0s"

      - "--respondingtimeouts.idletimeout=3m"

      - "--respondingtimeouts.readtimeout=2m"

      - "--respondingtimeouts.readtimeout=0s"

      - "--respondingtimeouts.writetimeout=0s"

      - "--docker"

      - "--docker.domain=traefik"

      - "--docker.watch"

      - "--docker.network=${TRAEFIK_NET_NAME}"

      - "--docker.domain=${PUBLIC_HOSTNAME}"

      - "--docker.swarmmode"

      - "--metrics.prometheus=true"

      - "--metrics.prometheus.buckets=0.1,0.3,1.2,5.0"

      - "--metrics.prometheus.entrypoint=traefik"

      - "--sendAnonymousUsage=true"

    networks:

      - traefik-net

      - metric-net
@@ -31,11 +32,10 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:traefik.${PUBLIC_HOSTNAME}

        traefik.port: "8080"

        traefik.backend: traefik

        traefik.port: '8080'

      placement:

        constraints:

          - node.role == manager
@@ -47,15 +47,18 @@ services: 
          cpus: '2'

          memory: 128M

        reservations:

          memory: 103M

          memory: 64M



networks:

  traefik-net:

    external: true

    name: ${TRAEFIK_NET_NAME}

    driver: overlay

    attachable: ${TRAEFIK_NET_ATTACHABLE:-true}



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



volumes:

  vol:

    name: traefik-vol
 
    name: ${TRAEFIK_VOL_NAME:-traefik-vol}