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

Reemplaza variables "slave" por "node" 

Salvo las variables que escapan a nuestro control (internas de imagen
base), se usa el termino node en lugar de slave, para hacer honor al
nombre del servicio.
parent 26d20ade

deploy/.env

+4 −4
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ TOMCAT_EXTRAS=false 


MASTER_INITIAL_MEMORY=1500M

MASTER_MAXIMUM_MEMORY=2500M

DEV_SLAVE_INITIAL_MEMORY=1G

DEV_SLAVE_MAXIMUM_MEMORY=2G

PRO_SLAVE_INITIAL_MEMORY=1500M

PRO_SLAVE_MAXIMUM_MEMORY=2500G

DEV_NODE_INITIAL_MEMORY=1G

DEV_NODE_MAXIMUM_MEMORY=2G

PRO_NODE_INITIAL_MEMORY=1500M

PRO_NODE_MAXIMUM_MEMORY=2500G



POSTGRES_USER=geowebcache

POSTGRES_PASSWORD=changeme

deploy/docker-compose.dev.yml

+8 −7
Original line number Diff line number Diff line
@@ -3,17 +3,18 @@ version: '3.8' 
services:

  geoserver-node:

    environment:

      INITIAL_MEMORY: ${DEV_SLAVE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_SLAVE_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${DEV_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_NODE_MAXIMUM_MEMORY}

    deploy:

      replicas: ${GEOSERVER_SLAVE_REPLICAS:-1}

      replicas: ${GEOSERVER_NODE_REPLICAS:-1}

      resources:

        limits:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_LIMITS_MEMORY:-2500M}

          cpus: '${GEOSERVER_NODE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY:-2500M}

        reservations:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_MEMORY:-1500M}

          cpus: '${GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY:-1500M}





volumes:

  geoserver-data-vol:

deploy/docker-compose.prod.yml

+7 −7
Original line number Diff line number Diff line
@@ -3,20 +3,20 @@ version: '3.8' 
services:

  geoserver-node:

    environment:

      INITIAL_MEMORY: ${PRO_SLAVE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_SLAVE_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${PRO_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_NODE_MAXIMUM_MEMORY}

    deploy:

      replicas: ${GEOSERVER_SLAVE_REPLICAS:-3}

      replicas: ${GEOSERVER_NODE_REPLICAS:-3}

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_LIMITS_MEMORY:-3G}

          cpus: '${GEOSERVER_NODE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_MEMORY:-2G}

          cpus: '${GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY:-2G}



volumes:

  geoserver-data-vol:

deploy/docker-compose.tmpl.yml

+6 −6
Original line number Diff line number Diff line
@@ -86,10 +86,10 @@ services: 
    networks: *geoserver-networks

    healthcheck:

      test:  curl --fail --silent http://localhost:${GEOSERVER_PORT}/geoserver

      interval: ${GEOSERVER_SLAVE_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${GEOSERVER_SLAVE_HEALTHCHECK_TIMEOUT:-10s}

      retries: ${GEOSERVER_SLAVE_HEALTHCHECK_RETRIES:-3}

      start_period: ${GEOSERVER_SLAVE_HEALTHCHECK_START_PERIOD:-3m}

      interval: ${GEOSERVER_NODE_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${GEOSERVER_NODE_HEALTHCHECK_TIMEOUT:-10s}

      retries: ${GEOSERVER_NODE_HEALTHCHECK_RETRIES:-3}

      start_period: ${GEOSERVER_NODE_HEALTHCHECK_START_PERIOD:-3m}

    deploy:

      mode: replicated

      placement:
@@ -100,9 +100,9 @@ services: 
        traefik.backend: geoserver-node

        traefik.port: '${GEOSERVER_PORT}'

      restart_policy:

        delay: ${GEOSERVER_SLAVE_RESTART_DELAY:-10s}

        delay: ${GEOSERVER_NODE_RESTART_DELAY:-10s}

      update_config:

        delay: ${GEOSERVER_SLAVE_UPDATE_DELAY:-3m}

        delay: ${GEOSERVER_NODE_UPDATE_DELAY:-3m}



  postgres-gwc:

    image: ${POSTGRES_IMAGE_NAME:-postgres}:${POSTGRES_IMAGE_TAG:-alpine}