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

Merge branch 'dev' into 'master' 

Adapta despliegue a imagen de kartoza para v2.20

See merge request redmic-project/gis/geoserver!62
parents e01bc58f 79445633

deploy/.env

+4 −0
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ GEOSERVER_PORT=8080 
BROKER_PORT=61616

GEOSERVER_DATA_DIR=/opt/geoserver/data_dir

GEOWEBCACHE_CACHE_DIR=/opt/geoserver/gwc

FONTS_DIR=/opt/fonts

FOOTPRINTS_DATA_DIR=/opt/footprints_dir

EXTRA_CONFIG_DIR=/settings

HTTP_SCHEME=https

GEOSERVER_ADMIN_USER=admin

GEOSERVER_ADMIN_PASSWORD=changeme

STABLE_EXTENSIONS=css-plugin,inspire-plugin,csw-plugin,netcdf-plugin,netcdf-out-plugin,ysld-plugin
@@ -14,6 +16,8 @@ TOMCAT_EXTRAS=false 
GEOSERVER_LABEL_COLOR=white

GEOSERVER_LABEL_BACKGROUND=black

GEOSERVER_SUBDOMAIN=atlas

DISK_QUOTA_SIZE=5

GEOSERVER_LOG_LEVEL=PRODUCTION_LOGGING



DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1500M

deploy/config/web.xml

deleted100644 → 0
+0 −4156

File deleted.

Preview size limit exceeded, changes collapsed.

deploy/docker-compose.tmpl.yml

+6 −15
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ x-geoserver-root: &geoserver-root 
x-geoserver-environment: &geoserver-environment

  GEOSERVER_DATA_DIR:

  GEOWEBCACHE_CACHE_DIR:

  FONTS_DIR:

  FOOTPRINTS_DATA_DIR:

  EXTRA_CONFIG_DIR:

  GEOSERVER_LOG_LOCATION: 'logs/{{.Service.Name}}-{{.Task.Slot}}.log'

  HTTP_PORT: '${GEOSERVER_PORT}'

  HTTP_SCHEME:

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

  GEOSERVER_ADMIN_USER:

  GEOSERVER_ADMIN_PASSWORD:
@@ -29,11 +31,12 @@ x-geoserver-environment: &geoserver-environment 
  POSTGRES_DB:

  POSTGRES_USER:

  POSTGRES_PASS: '${POSTGRES_PASSWORD}'

  DISK_QUOTA_SIZE:

  GEOSERVER_LOG_LEVEL:



x-geoserver-volumes: &geoserver-volumes

  - geoserver-data-vol:${GEOSERVER_DATA_DIR}

  - fonts-vol:/opt/fonts

  - certs-vol:/etc/certs

  - fonts-vol:${FONTS_DIR}

  - footprints-vol:${FOOTPRINTS_DATA_DIR}

  - cache-vol:${GEOWEBCACHE_CACHE_DIR}
@@ -70,8 +73,6 @@ services: 
    volumes: *geoserver-volumes

    networks: *geoserver-networks

    configs:

      - source: web-xml-config

        target: ${EXTRA_CONFIG_DIR}/web.xml

      - source: master-cluster-properties-config

        target: ${EXTRA_CONFIG_DIR}/cluster.properties

    healthcheck: *geoserver-healthcheck
@@ -94,15 +95,13 @@ services: 
      << : *geoserver-environment

      TOGGLE_MASTER: 'false'

      TOGGLE_SLAVE: 'true'

      WEB_INTERFACE: 'true'

      DISABLE_WEB_INTERFACE: 'true'

      EMBEDDED_BROKER: disabled

      BROKER_URL: 'tcp://geoserver-master:${BROKER_PORT}'

      READONLY: enabled

    volumes: *geoserver-volumes

    networks: *geoserver-networks

    configs:

      - source: web-xml-config

        target: ${EXTRA_CONFIG_DIR}/web.xml

      - source: node-cluster-properties-config

        target: ${EXTRA_CONFIG_DIR}/cluster.properties

    healthcheck: *geoserver-healthcheck
@@ -151,10 +150,6 @@ services: 
          cpus: '${POSTGRES_GWC_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${POSTGRES_GWC_RESOURCES_RESERVATIONS_MEMORY:-32M}



volumes:

  certs-vol:

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



networks:

  gis-net:

    name: ${GIS_NET_NAME:-gis-net}
@@ -172,10 +167,6 @@ networks: 
    external: true



configs:

  web-xml-config:

    name: ${WEB_XML_CONFIG_NAME:-geoserver-web-xml-config}

    file: ./config/web.xml



  master-cluster-properties-config:

    name: ${MASTER_CLUSTER_PROPERTIES_CONFIG_NAME:-geoserver-master-cluster-properties-config}

    file: ./config/master-cluster.properties