Commit 32e80f70 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Pone al día configuración compose y ci

See merge request redmic-project/testing/selenium-hub!7
parents 8ba6266f 4aeaefa9

.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/docker-compose.tmpl.yml→deploy/compose.yaml

+1 −3
Original line number Diff line number Diff line 
version: '3.9'



services:

  selenium-hub:

    image: ${IMAGE_NAME:-selenium/hub}:${IMAGE_TAG:-latest}
@@ -29,7 +27,7 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.enable: 'true'

        traefik.enable: ${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}

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'

deploy/docker-compose.prod.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'