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

Merge branch 'dev' into 'master' 

Descarta fichero de config y reorganiza compose

See merge request redmic-project/service-deployment!11
parents d4713d97 4cb372a4

traefik/.env

deleted100644 → 0
+0 −0

Empty file deleted.

traefik/docker-compose.prod.yml

+17 −0
Original line number Diff line number Diff line
@@ -2,11 +2,22 @@ version: '3.5' 


services:

  traefik:

    command:

      - "--logLevel=ERROR"

      - "--entrypoints=Name:http Address::80 Redirect.EntryPoint:https"

      - "--entrypoints=Name:https Address::443 TLS:/ssl/certFile.cert,/ssl/keyFile.key"

      - "--defaultentrypoints=http,https"

      - "--docker.swarmmode"

    ports:

      - 80:80

      - 443:443

    networks:

      - traefik-net

    secrets:

      - source: certFile-secret

        target: /ssl/certFile.cert

      - source: keyFile-secret

        target: /ssl/keyFile.key

    deploy:

      mode: replicated

      replicas: 1
@@ -26,3 +37,9 @@ services: 
networks:

  traefik-net:

    external: true



secrets:

  certFile-secret:

    file: ./certFile.cert

  keyFile-secret:

    file: ./keyFile.key

traefik/docker-compose.tmpl.yml

+0 −24
Original line number Diff line number Diff line
@@ -5,38 +5,14 @@ services: 
    image: traefik:${IMAGE_TAG:-latest}

    command:

      - "--api"

      - "--logLevel=ERROR"

      - "--configfile=/etc/traefik/traefik.toml"

      - "--entrypoints=Name:http Address::80 Redirect.EntryPoint:https"

      - "--entrypoints=Name:https Address::443 TLS:/ssl/certFile.cert,/ssl/keyFile.key"

      - "--defaultentrypoints=http,https"

      - "--docker"

      - "--docker.swarmmode"

      - "--docker.domain=traefik"

      - "--docker.watch"

    configs:

      - source: traefik-config

        target: /etc/traefik/traefik.toml

    secrets:

      - source: certFile-secret

        target: /ssl/certFile.cert

      - source: keyFile-secret

        target: /ssl/keyFile.key

    networks:

      - redmic-net

    volumes:

      - /var/run/docker.sock:/var/run/docker.sock



configs:

  traefik-config:

    file: ./traefik.toml



secrets:

  certFile-secret:

    file: ./certFile.cert

  keyFile-secret:

    file: ./keyFile.key



networks:

  redmic-net:

    external: true

traefik/traefik.toml

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
[backends]

  [backends.web-error]

    [backends.web-error.servers.web-error]

    url = "http://50x.redmic.s3-website-eu-west-1.amazonaws.com"