Commit 8ba6266f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Migra labels hacia Traefik v2, renombra variable

See merge request redmic-project/testing/selenium-hub!6
parents 6e64f026 49129adc

deploy/.env

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ SE_HUB_PORT=4444 
SE_SESSION_REQUEST_TIMEOUT=30

SE_SESSION_RETRY_INTERVAL=5



UI_AUTH=user:$apr1$md5password
 
TRAEFIK_AUTH=user:$apr1$md5password

deploy/docker-compose.tmpl.yml

+6 −4
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

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

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN:-selenium}.${PUBLIC_HOSTNAME}

        traefik.backend: selenium-hub

        traefik.port: '${SE_HUB_PORT}'

        traefik.enable: 'true'

        traefik.http.routers.selenium-hub.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.selenium-hub.rule: Host(`${TRAEFIK_SUBDOMAIN:-selenium}.${PUBLIC_HOSTNAME}`)

        traefik.http.middlewares.selenium-hub-auth.basicauth.users: ${TRAEFIK_AUTH}

        traefik.http.routers.selenium-hub.middlewares: selenium-hub-auth

        traefik.http.services.selenium-hub.loadbalancer.server.port: ${SE_HUB_PORT}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'