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

Revisa 

Incluye nuevas variables de configuración, actualiza algunos valores
tras releer documentación.

Prueba introducción de ruta de proxy, para que GeoServer sea consciente
de dónde se encuentra de cara al público.

Introduce nombre de instancia visible en el gestor web.

Incluye username y password de admin por defecto como variables.

Activa la "durabilidad" en el topic del clúster, para que una instancia
perdida recupere todos los cambios pendientes al volver a conectarse.

Elimina extensión para clúster jms, ya que debería instalarse por
defecto aunque no se especifique (al activar "CLUSTERING").

Actualiza volúmenes, ya que en la versión 2.19.2 se ha corregido la
declaración de volumen anidado y modificado el de certificados (no
usado).
parent 2cd7b0eb

.dockerignore

+0 −1
Original line number Diff line number Diff line 
*
 
!scripts

deploy/.env

+11 −4
Original line number Diff line number Diff line 
GEOSERVER_PORT=8080

HTTP_PROXY_PORT=443

BROKER_PORT=61616

GEOSERVER_DATA_DIR=/opt/geoserver/data_dir

GEOWEBCACHE_CACHE_DIR=/opt/geoserver/gwc

FOOTPRINTS_DATA_DIR=/opt/footprints_dir

GEOSERVER_ADMIN_USER=admin

GEOSERVER_ADMIN_PASSWORD=changeme

STABLE_EXTENSIONS=css-plugin,inspire-plugin,csw-plugin,netcdf-plugin,netcdf-out-plugin,ysld-plugin

COMMUNITY_EXTENSIONS=jms-cluster-plugin

COMMUNITY_EXTENSIONS=

CLUSTERING=true

CLUSTER_DURABILITY=false

CLUSTER_DURABILITY=true

TOMCAT_EXTRAS=false

GEOSERVER_LABEL_COLOR=white

GEOSERVER_LABEL_BACKGROUND=black



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_MASTER_INITIAL_MEMORY=1500M

PRO_MASTER_MAXIMUM_MEMORY=2500G

PRO_NODE_INITIAL_MEMORY=1500M

PRO_NODE_MAXIMUM_MEMORY=2500G

deploy/docker-compose.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ services: 
      INITIAL_MEMORY: ${DEV_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_NODE_MAXIMUM_MEMORY}

    deploy:

      replicas: ${GEOSERVER_NODE_REPLICAS:-1}

      resources:

        limits:

          cpus: '${GEOSERVER_NODE_RESOURCES_LIMITS_CPUS:-1}'

deploy/docker-compose.prod.yml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ services: 
      INITIAL_MEMORY: ${PRO_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_NODE_MAXIMUM_MEMORY}

    deploy:

      replicas: ${GEOSERVER_NODE_REPLICAS:-3}

      placement:

        constraints:

          - node.role == worker

deploy/docker-compose.tmpl.yml

+14 −10
Original line number Diff line number Diff line
@@ -4,23 +4,27 @@ x-geoserver-root: &geoserver-root 
  image: ${GEOSERVER_IMAGE_NAME:-kartoza/geoserver}:${GEOSERVER_IMAGE_TAG:-latest}



x-geoserver-environment: &geoserver-environment

  GEOSERVER_DATA_DIR:

  GEOWEBCACHE_CACHE_DIR:

  FOOTPRINTS_DATA_DIR:

  HTTP_PORT: '${GEOSERVER_PORT}'

  HTTP_PROXY_NAME: '${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}'

  HTTP_PROXY_PORT:

  STABLE_EXTENSIONS:

  COMMUNITY_EXTENSIONS:

  CLUSTERING:

  EXISTING_DATA_DIR: 'true'

  RANDOMSTRING: '{{.Service.Name}}-{{.Task.Slot}}'

  INSTANCE_STRING: 'instance-{{.Service.Name}}-{{.Task.Slot}}'

  INSTANCE_STRING: '{{.Service.Name}}-{{.Task.Slot}}'

  CLUSTER_DURABILITY:

  TOMCAT_EXTRAS:

  GEOSERVER_NODE_OPTS: 'id:{{.Service.Name}}-{{.Task.Slot}};background:${GEOSERVER_LABEL_BACKGROUND};color:${GEOSERVER_LABEL_COLOR}'



x-geoserver-volumes: &geoserver-volumes

  - geoserver-data-vol:/opt/geoserver/data_dir

  - geoserver-data-vol:${GEOSERVER_DATA_DIR}

  - fonts-vol:/opt/fonts

  - letsencrypt-vol:/etc/letsencrypt

  - footprints-vol:/opt/footprints_dir

  - old-cache-vol:/opt/geoserver/data_dir/gwc

  - certs-vol:/etc/certs

  - footprints-vol:${FOOTPRINTS_DATA_DIR}

  - cache-vol:${GEOWEBCACHE_CACHE_DIR}



x-geoserver-networks: &geoserver-networks
@@ -47,6 +51,8 @@ services: 
    << : *geoserver-root

    environment:

      << : *geoserver-environment

      GEOSERVER_ADMIN_USER:

      GEOSERVER_ADMIN_PASSWORD:

      TOGGLE_MASTER: 'true'

      TOGGLE_SLAVE: 'false'

      WEB_INTERFACE: 'false'
@@ -83,6 +89,7 @@ services: 
    healthcheck: *geoserver-healthcheck

    deploy:

      << : *geoserver-deploy

      replicas: ${GEOSERVER_NODE_REPLICAS:-1}

      placement:

        max_replicas_per_node: 1

      labels:
@@ -123,11 +130,8 @@ services: 
          memory: ${POSTGRES_GWC_RESOURCES_RESERVATIONS_MEMORY:-32M}



volumes:

  letsencrypt-vol:

    name: ${LETSENCRYPT_VOL_NAME:-geoserver-letsencrypt-vol}



  old-cache-vol:

    name: ${OLD_CACHE_VOL_NAME:-geoserver-old-cache-vol}

  certs-vol:

    name: ${CERTS_VOL_NAME:-geoserver-certs-vol}



networks:

  gis-net: