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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/gis/geoserver!61
parents 91512467 f9845499

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ stages: 
  variables:

    STACK: gis

  environment:

    url: https://${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}
 
    url: https://${DD_GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

deploy/.env

+11 −2
Original line number Diff line number Diff line
@@ -17,12 +17,21 @@ GEOSERVER_SUBDOMAIN=atlas 


DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1500M

DEV_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY=2500M

DEV_NODE_INITIAL_MEMORY=1G

DEV_NODE_MAXIMUM_MEMORY=2G

DEV_NODE_MAXIMUM_MEMORY=1500M

DEV_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY=2500M



PRO_MASTER_INITIAL_MEMORY=1G

PRO_MASTER_MAXIMUM_MEMORY=1500M

PRO_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

PRO_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY=2500M

PRO_NODE_INITIAL_MEMORY=1G

PRO_NODE_MAXIMUM_MEMORY=2500M

PRO_NODE_MAXIMUM_MEMORY=2G

PRO_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY=1500M

PRO_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY=3G



POSTGRES_USER=geowebcache

POSTGRES_PASSWORD=changeme

deploy/docker-compose.dev.yml

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

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-2500M}

          memory: ${DEV_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-1500M}

          memory: ${DEV_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY}



  geoserver-node:

    environment:
@@ -22,10 +22,10 @@ services: 
      resources:

        limits:

          cpus: '${GEOSERVER_NODE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY:-2500M}

          memory: ${DEV_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY:-1500M}

          memory: ${DEV_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY}



volumes:

  geoserver-data-vol:

deploy/docker-compose.prod.yml

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

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY:-3G}

          memory: ${PRO_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY:-2G}

          memory: ${PRO_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY}



  geoserver-node:

    environment:
@@ -25,10 +25,10 @@ services: 
      resources:

        limits:

          cpus: '${GEOSERVER_NODE_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY:-3G}

          memory: ${PRO_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${GEOSERVER_NODE_RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY:-2G}

          memory: ${PRO_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY}



volumes:

  geoserver-data-vol:

deploy/docker-compose.tmpl.yml

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ services: 
        traefik.default.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/'

        traefik.root.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};Path:/;AddPrefix:/geoserver'

        traefik.backend: geoserver-node

        traefik.backend.loadbalancer.stickiness: 'true'

        traefik.backend.loadbalancer.stickiness.cookieName: traefik-geoserver-node

        traefik.backend.loadbalancer.method: drr

        traefik.port: '${GEOSERVER_PORT}'



  postgres-gwc: