Commit e279e347 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!63
parents c20c43b7 f0707070

.gitlab-ci.yml

+15 −1
Original line number Diff line number Diff line
@@ -2,12 +2,26 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

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

    ref: master

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



stages:

  - deploy

  - deploy-external-service



variables:

  PROJECT_PARENT_NAME: gis



.deploy:

  variables:

    STACK: gis

    STACK: ${PROJECT_PARENT_NAME}

  environment:

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



.deploy-external-service:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    DD_BACKUP_VOL_NAME: geoserver-data-vol

    DD_PATHS_TO_EXCLUDE: cluster monitoring logs/*.log temp tmp

    DD_PUSHGATEWAY_LABEL: files-backup-redmic-geoserver

deploy/docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ services: 
      INITIAL_MEMORY: ${PRO_MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_MASTER_MAXIMUM_MEMORY}

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${GEOSERVER_MASTER_RESOURCES_LIMITS_CPUS:-1}'