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

Merge branch 'dev' into 'master' 

Habilita soporte CORS

See merge request redmic-project/gis/geoserver!69
parents d5cd6f19 0d52fd7f

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-external-service/backup-files.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/maintenance.yml'

    file: '/deployment-service/maintenance.yml'



stages:

  - deploy
@@ -20,7 +20,7 @@ variables: 
.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    STATUS_CHECK_DELAY: 300

    STATUS_CHECK_DELAY: 360



.deploy-external-service:

  variables:

deploy/.env

+8 −10
Original line number Diff line number Diff line 
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

COMMUNITY_EXTENSIONS=jms-cluster-plugin

CLUSTERING=true

CLUSTER_DURABILITY=false

CLUSTER_CONNECTION_RETRY_COUNT=10

CLUSTER_CONNECTION_MAX_WAIT=500

TOMCAT_EXTRAS=false

ROOT_WEBAPP_REDIRECT=true

GEOSERVER_LABEL_COLOR=white
@@ -21,9 +19,14 @@ GEOSERVER_LABEL_BACKGROUND=black 
GEOSERVER_SUBDOMAIN=atlas

DISK_QUOTA_SIZE=5

GEOSERVER_LOG_LEVEL=PRODUCTION_LOGGING

DISABLE_CORS=true

DISABLE_CORS=false

GEOSERVER_XSTREAM_WHITELIST=org.geotools.jdbc.**



CLUSTERING=true

CLUSTER_DURABILITY=false

CLUSTER_CONNECTION_RETRY_COUNT=10

CLUSTER_CONNECTION_MAX_WAIT=500



DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1G

DEV_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M
@@ -68,10 +71,5 @@ WAL_VOL_NAME=postgres-gwc-wal-vol 


PUBLIC_HOSTNAME=change.me

GEOSERVER_HEALTH_PATH=/geoserver/rest/about/version.xml

TRAEFIK_ENABLE=true

TRAEFIK_ENTRYPOINT=http

TRAEFIK_HEALTH_AUTH=Basic YWRtaW46Y2hhbmdlbWU=
 
TRAEFIK_COOKIE_NAME=traefik-geoserver

TRAEFIK_COOKIE_HTTPONLY=true

TRAEFIK_COOKIE_SECURE=true

TRAEFIK_COOKIE_SAMESITE=lax

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



services:

  geoserver-master:

    environment:

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



services:

  geoserver-master:

    environment:

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+14 −18
Original line number Diff line number Diff line 
version: '3.9'



x-geoserver-root: &geoserver-root

  image: ${GEOSERVER_IMAGE_NAME:-kartoza/geoserver}:${GEOSERVER_IMAGE_TAG:-latest}

  networks:
@@ -20,6 +18,7 @@ x-geoserver-root: &geoserver-root 
    timeout: ${GEOSERVER_HEALTHCHECK_TIMEOUT:-15s}

    retries: ${GEOSERVER_HEALTHCHECK_RETRIES:-5}

    start_period: ${GEOSERVER_HEALTHCHECK_START_PERIOD:-5m}

    disable: ${GEOSERVER_HEALTHCHECK_DISABLE:-false}



x-geoserver-environment: &geoserver-environment

  GEOSERVER_DATA_DIR:
@@ -63,13 +62,16 @@ x-geoserver-deploy: &geoserver-deploy 
    delay: ${GEOSERVER_UPDATE_DELAY:-3m}



x-geoserver-traefik-common-service-labels: &geoserver-traefik-common-service-labels

  traefik.enable: ${TRAEFIK_ENABLE}

  traefik.enable: ${TRAEFIK_ENABLE:-true}



  traefik.http.services.geoserver.loadbalancer.server.port: ${GEOSERVER_PORT}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie: 'true'

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.name: ${TRAEFIK_COOKIE_NAME}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.httponly: '${TRAEFIK_COOKIE_HTTPONLY}'

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.secure: '${TRAEFIK_COOKIE_SECURE}'

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.samesite: ${TRAEFIK_COOKIE_SAMESITE}



  traefik.http.services.geoserver.loadbalancer.sticky.cookie: ${TRAEFIK_STICKY_COOKIE:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.name: ${TRAEFIK_STICKY_COOKIE_NAME:-traefik-geoserver}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.httponly: ${TRAEFIK_STICKY_COOKIE_HTTPONLY:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.secure: ${TRAEFIK_STICKY_COOKIE_SECURE:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.samesite: ${TRAEFIK_STICKY_COOKIE_SAMESITE:-lax}



  traefik.http.services.geoserver.loadbalancer.healthcheck.path: ${GEOSERVER_HEALTH_PATH}

  traefik.http.services.geoserver.loadbalancer.healthcheck.headers.authorization: ${TRAEFIK_HEALTH_AUTH}
@@ -80,7 +82,7 @@ services: 
      << : *geoserver-environment

      TOGGLE_MASTER: 'true'

      TOGGLE_SLAVE: 'false'

      WEB_INTERFACE: 'false'

      DISABLE_WEB_INTERFACE: 'false'

      EMBEDDED_BROKER: enabled

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

      READONLY: disabled
@@ -92,12 +94,10 @@ services: 


        traefik.http.routers.geoserver-master-admin.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.geoserver-master-admin.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`) && (PathPrefix(`/geoserver/web`) || PathPrefix(`/geoserver/rest`) || PathPrefix(`/geoserver/j_spring_security`) || PathPrefix(`/geoserver/gwc/rest`))

        traefik.http.middlewares.add-proxy-protocol-header.headers.customrequestheaders.x-forwarded-proto: https

        traefik.http.routers.geoserver-master-admin.middlewares: add-proxy-protocol-header

        traefik.http.routers.geoserver-master-admin.service: geoserver-master



        traefik.http.routers.geoserver-master.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.geoserver-master.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`) && PathPrefix(`/geoserver`)

        traefik.http.routers.geoserver-master.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.routers.geoserver-master.service: geoserver



        traefik.http.services.geoserver-master.loadbalancer.server.port: ${GEOSERVER_PORT}
@@ -122,12 +122,7 @@ services: 
        << : *geoserver-traefik-common-service-labels



        traefik.http.routers.geoserver-node.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.geoserver-node.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`) && PathPrefix(`/geoserver`)



        traefik.http.routers.geoserver-root.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.geoserver-root.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`) && PathPrefix(`/`)

        traefik.http.middlewares.geoserver-addprefix.addprefix.prefix: /geoserver

        traefik.http.routers.geoserver-root.middlewares: geoserver-addprefix

        traefik.http.routers.geoserver-node.rule: Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)



  postgres-gwc:

    image: ${POSTGRES_IMAGE_NAME:-postgres}:${POSTGRES_IMAGE_TAG:-alpine}
@@ -151,6 +146,7 @@ services: 
      timeout: ${POSTGRES_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${POSTGRES_HEALTHCHECK_RETRIES:-5}

      start_period: ${POSTGRES_HEALTHCHECK_START_PERIOD:-5m}

      disable: ${POSTGRES_HEALTHCHECK_DISABLE:-false}

    deploy:

      mode: replicated

      replicas: ${POSTGRES_GWC_REPLICAS:-1}