Commit 26d20ade authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige definición de recursos 

Corrige el nombre de las variables de recursos de cpu, ya que compartían
nombre entre reserva y límite.
Independiza límites de memoria internos de geoserver de los establecidos
a nivel de contenedor, ya que dentro del mismo se ejecutan más servicios
aparte de geoserver (activemq, gwc...) y necesitan memoria.
Aplica nuevos valores acordes a lo anterior, para dejar margen de
memoria.
parent 841eb53b

deploy/.env

+4 −4
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ CLUSTER_DURABILITY=false 
TOMCAT_EXTRAS=false



MASTER_INITIAL_MEMORY=1500M

MASTER_MAXIMUM_MEMORY=3G

DEV_SLAVE_INITIAL_MEMORY=1500M

DEV_SLAVE_MAXIMUM_MEMORY=3G

MASTER_MAXIMUM_MEMORY=2500M

DEV_SLAVE_INITIAL_MEMORY=1G

DEV_SLAVE_MAXIMUM_MEMORY=2G

PRO_SLAVE_INITIAL_MEMORY=1500M

PRO_SLAVE_MAXIMUM_MEMORY=3G

PRO_SLAVE_MAXIMUM_MEMORY=2500G



POSTGRES_USER=geowebcache

POSTGRES_PASSWORD=changeme

deploy/docker-compose.dev.yml

+3 −3
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ services: 
      resources:

        limits:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${DEV_SLAVE_MAXIMUM_MEMORY}

          memory: ${GEOSERVER_SLAVE_RESOURCES_LIMITS_MEMORY:-2500M}

        reservations:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${DEV_SLAVE_INITIAL_MEMORY}

          cpus: '${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_MEMORY:-1500M}



volumes:

  geoserver-data-vol:

deploy/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ services: 
      resources:

        limits:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${PRO_SLAVE_MAXIMUM_MEMORY}

          memory: ${GEOSERVER_SLAVE_RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          cpus: '${GEOSERVER_SLAVE_RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${PRO_SLAVE_INITIAL_MEMORY}

          cpus: '${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_SLAVE_RESOURCES_RESERVATIONS_MEMORY:-2G}



volumes:

  geoserver-data-vol:

deploy/docker-compose.tmpl.yml

+3 −3
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ services: 
      resources:

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${MASTER_MAXIMUM_MEMORY}

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${MASTER_INITIAL_MEMORY}

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-2G}



  geoserver-node:

    << : *geoserver-root