Commit 5e0aab51 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Añade ajustes para proxies de confianza y enable

See merge request redmic-project/gateway/traefik!8
parents c087b9f8 8e385dd4

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

deploy/.env

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ TRAEFIK_ENTRYPOINT=http 
TRAEFIK_AUTH=user:$apr1$md5password

TRAEFIK_NET_NAME=traefik-net

HTTP_INTERNAL_PORT=80

MQTT_PORT=1883

MQTT_INTERNAL_PORT=1883

PORT_MODE=host



TRAEFIK_API=true

TRAEFIK_API_DASHBOARD=true
@@ -21,9 +24,13 @@ TRAEFIK_SERVERSTRANSPORT_FORWARDINGTIMEOUTS_IDLECONNTIMEOUT=90s 
TRAEFIK_SERVERSTRANSPORT_FORWARDINGTIMEOUTS_RESPONSEHEADERTIMEOUT=0s

TRAEFIK_SERVERSTRANSPORT_INSECURESKIPVERIFY=true



TRAEFIK_ENTRYPOINTS_HTTP_FORWARDEDHEADERS_TRUSTEDIPS=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16

TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_IDLETIMEOUT=3m

TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT=0s

TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT=0s

TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_IDLETIMEOUT=3m

TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT=0s

TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT=0s



TRAEFIK_PROVIDERS_DOCKER=true

TRAEFIK_PROVIDERS_DOCKER_EXPOSEDBYDEFAULT=false

deploy/compose.dev.yaml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
services: {}

deploy/compose.prod.yaml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
services: {}

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+20 −6
Original line number Diff line number Diff line 
version: '3.9'



services:

  traefik-v2:

    image: ${IMAGE_NAME:-traefik}:${IMAGE_TAG:-latest}
@@ -20,9 +18,14 @@ services: 
      TRAEFIK_SERVERSTRANSPORT_FORWARDINGTIMEOUTS_RESPONSEHEADERTIMEOUT:

      TRAEFIK_SERVERSTRANSPORT_INSECURESKIPVERIFY:

      TRAEFIK_ENTRYPOINTS_HTTP_ADDRESS: :${HTTP_INTERNAL_PORT}

      TRAEFIK_ENTRYPOINTS_HTTP_FORWARDEDHEADERS_TRUSTEDIPS:

      TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_IDLETIMEOUT:

      TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT:

      TRAEFIK_ENTRYPOINTS_HTTP_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT:

      TRAEFIK_ENTRYPOINTS_MQTT_ADDRESS: :${MQTT_INTERNAL_PORT}

      TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_IDLETIMEOUT:

      TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_READTIMEOUT:

      TRAEFIK_ENTRYPOINTS_MQTT_TRANSPORT_RESPONDINGTIMEOUTS_WRITETIMEOUT:

      TRAEFIK_PROVIDERS_DOCKER:

      TRAEFIK_PROVIDERS_DOCKER_EXPOSEDBYDEFAULT:

      TRAEFIK_PROVIDERS_DOCKER_WATCH:
@@ -36,6 +39,11 @@ services: 
      TRAEFIK_METRICS_PROMETHEUS_ENTRYPOINT:

    networks:

      traefik-net:

    ports:

      - target: ${MQTT_INTERNAL_PORT}

        published: ${MQTT_PORT}

        protocol: tcp

        mode: ${PORT_MODE}

    volumes:

      - tmp-vol:/tmp

      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -48,15 +56,17 @@ services: 
    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      placement:

        constraints:

          - node.labels.${PLACEMENT_CONSTRAINTS_NODE_LABELS_NAME:-gateway} == ${PLACEMENT_CONSTRAINTS_NODE_LABELS_VALUE:-true}

      restart_policy:

        delay: ${RESTART_DELAY:-0s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      placement:

        max_replicas_per_node: 1

        constraints:

          - node.role == manager

          - node.labels.${PLACEMENT_CONSTRAINTS_NODE_LABELS_NAME:-gateway} == ${PLACEMENT_CONSTRAINTS_NODE_LABELS_VALUE:-true}

      labels:

        traefik.enable: 'true'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.services.dummy.loadbalancer.server.port: 0



        traefik.http.routers.traefik-dashboard.entrypoints: ${TRAEFIK_ENTRYPOINT}
@@ -72,6 +82,10 @@ services: 
        traefik.http.middlewares.www-redirect-regex.redirectregex.permanent: 'true'

        traefik.http.routers.www-redirect.middlewares: www-redirect-regex

        traefik.http.routers.www-redirect.service: noop@internal



        traefik.http.routers.traefik-ping.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.traefik-ping.rule: HostRegexp(`{any-subdomain:.*}`) && Path(`/ping`)

        traefik.http.routers.traefik-ping.service: ping@internal

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'