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

Corrige config, reunifica y añade red propia

parent 8bc21fd5

deploy/docker-compose.tmpl.yml

+28 −25
Original line number Diff line number Diff line 
version: '3.5'



x-selenium-node-environment: &selenium-node-environment

  SE_EVENT_BUS_HOST: ${SE_HUB_HOST}

  SE_EVENT_BUS_PUBLISH_PORT:

  SE_EVENT_BUS_SUBSCRIBE_PORT:

  SE_NODE_HOST: '{{.Service.Name}}'



x-selenium-node-commons: &selenium-node-commons

  networks:

    selenium-net:

  volumes:

    - /dev/shm:/dev/shm

  healthcheck:

    test: curl -sSL http://localhost:5555/status

    interval: ${SELENIUM_NODE_HEALTHCHECK_INTERVAL:-30s}

    timeout: ${SELENIUM_NODE_HEALTHCHECK_TIMEOUT:-15s}

    retries: ${SELENIUM_NODE_HEALTHCHECK_RETRIES:-5}

    start_period: ${SELENIUM_NODE_HEALTHCHECK_START_PERIOD:-1m}



services:

  selenium-hub:

    image: ${SELENIUM_HUB_IMAGE_NAME:-selenium/hub}:${SELENIUM_HUB_IMAGE_TAG:-latest}
@@ -10,6 +28,9 @@ services: 
      SE_SESSION_RETRY_INTERVAL:

      SE_OPTS: ${SELENIUM_HUB_SE_OPTS}

    networks:

      selenium-net:

        aliases:

          - ${SE_HUB_HOST}

      gitlab-net:

      traefik-net:

    healthcheck:
@@ -38,31 +59,13 @@ services: 
          cpus: '${SELENIUM_HUB_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${SELENIUM_HUB_RESOURCES_RESERVATIONS_MEMORY:-256M}



  x-selenium-node-environment: &selenium-node-environment

    SE_EVENT_BUS_HOST: ${SE_HUB_HOST}

    SE_EVENT_BUS_PUBLISH_PORT:

    SE_EVENT_BUS_SUBSCRIBE_PORT:

    SE_NODE_HOST: '{{.Service.Name}}'



  x-selenium-node-healthcheck: &selenium-node-healthcheck

    test: curl -sSL http://localhost:5555/status

    interval: ${SELENIUM_NODE_HEALTHCHECK_INTERVAL:-30s}

    timeout: ${SELENIUM_NODE_HEALTHCHECK_TIMEOUT:-15s}

    retries: ${SELENIUM_NODE_HEALTHCHECK_RETRIES:-5}

    start_period: ${SELENIUM_NODE_HEALTHCHECK_START_PERIOD:-1m}



  selenium-chrome:

    image: ${SELENIUM_CHROME_IMAGE_NAME:-selenium/node-chrome}:${SELENIUM_CHROME_IMAGE_TAG:-latest}

    environment:

      << : *selenium-node-environment

      SE_NODE_MAX_CONCURRENT_SESSIONS: ${SELENIUM_CHROME_MAX_CONCURRENT_SESSIONS:-1}

      SE_OPTS: ${SELENIUM_CHROME_SE_OPTS}

    networks:

      gitlab-net:

    volumes:

      - /dev/shm:/dev/shm

    healthcheck:

      << : *selenium-node-healthcheck

    << : *selenium-node-commons

    deploy:

      mode: replicated

      replicas: ${SELENIUM_CHROME_REPLICAS:-1}
@@ -84,12 +87,7 @@ services: 
      << : *selenium-node-environment

      SE_NODE_MAX_CONCURRENT_SESSIONS: ${SELENIUM_FIREFOX_MAX_CONCURRENT_SESSIONS:-1}

      SE_OPTS: ${SELENIUM_FIREFOX_SE_OPTS}

    networks:

      gitlab-net:

    volumes:

      - /dev/shm:/dev/shm

    healthcheck:

      << : *selenium-node-healthcheck

    << : *selenium-node-commons

    deploy:

      mode: replicated

      replicas: ${SELENIUM_FIREFOX_REPLICAS:-1}
@@ -106,6 +104,11 @@ services: 
          memory: ${SELENIUM_FIREFOX_RESOURCES_RESERVATIONS_MEMORY:-512M}



networks:

  selenium-net:

    name: ${SELENIUM_NET_NAME:-selenium-net}

    driver: ${SELENIUM_NET_DRIVER:-overlay}

    attachable: ${SELENIUM_NET_ATTACHABLE:-true}



  gitlab-net:

    name: ${GITLAB_NET_NAME:-gitlab-net}

    driver: ${GITLAB_NET_DRIVER:-overlay}