Commit 16d2c285 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite definir recursos de master por entorno

parent d4deeee5

deploy/.env

+4 −2
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ CLUSTERING=true 
CLUSTER_DURABILITY=false

TOMCAT_EXTRAS=false



MASTER_INITIAL_MEMORY=1500M

MASTER_MAXIMUM_MEMORY=2500M

DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=2G

PRO_MASTER_INITIAL_MEMORY=1500M

PRO_MASTER_MAXIMUM_MEMORY=2500G

DEV_NODE_INITIAL_MEMORY=1G

DEV_NODE_MAXIMUM_MEMORY=2G

PRO_NODE_INITIAL_MEMORY=1500M

deploy/docker-compose.dev.yml

+13 −1
Original line number Diff line number Diff line 
version: '3.8'



services:

  geoserver-master:

    environment:

      INITIAL_MEMORY: ${DEV_MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_MASTER_MAXIMUM_MEMORY}

    deploy:

      resources:

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-2500M}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-1500M}



  geoserver-node:

    environment:

      INITIAL_MEMORY: ${DEV_NODE_INITIAL_MEMORY}
@@ -15,7 +28,6 @@ services: 
          cpus: '${GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY:-1500M}





volumes:

  geoserver-data-vol:

    name: ${GEOSERVER_DATA_VOL_NAME}

deploy/docker-compose.prod.yml

+13 −0
Original line number Diff line number Diff line 
version: '3.8'



services:

  geoserver-master:

    environment:

      INITIAL_MEMORY: ${PRO_MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_MASTER_MAXIMUM_MEMORY}

    deploy:

      resources:

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-2G}



  geoserver-node:

    environment:

      INITIAL_MEMORY: ${PRO_NODE_INITIAL_MEMORY}

deploy/docker-compose.tmpl.yml

+0 −9
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ services: 
      EMBEDDED_BROKER: enabled

      BROKER_URL: 'tcp://0.0.0.0:${BROKER_PORT}'

      READONLY: disabled

      INITIAL_MEMORY: ${MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${MASTER_MAXIMUM_MEMORY}

    volumes: *geoserver-volumes

    networks: *geoserver-networks

    healthcheck:
@@ -64,13 +62,6 @@ services: 
        delay: ${GEOSERVER_MASTER_RESTART_DELAY:-10s}

      update_config:

        delay: ${GEOSERVER_MASTER_UPDATE_DELAY:-3m}

      resources:

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-2G}



  geoserver-node:

    << : *geoserver-root