Commit e1fe05a8 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/gis/geoserver into dev

parents da330b5d 00e9a6c2

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ deploy-geoserver-master-supporting-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_geoserver-master

    STATUS_CHECK_DELAY: 500

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.dev.yml
@@ -89,7 +88,6 @@ deploy-geoserver-slave-supporting-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_geoserver-slave

    STATUS_CHECK_DELAY: 500

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.geoserver-slave.tmpl.yml:docker-compose.geoserver-slave.dev.yml
@@ -116,7 +114,6 @@ deploy-geoserver-master-stable-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_geoserver-master

    STATUS_CHECK_DELAY: 500

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.prod.yml
@@ -143,7 +140,6 @@ deploy-geoserver-slave-stable-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_geoserver-slave

    STATUS_CHECK_DELAY: 500

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.geoserver-slave.tmpl.yml:docker-compose.geoserver-slave.prod.yml

deploy/docker-compose.geoserver-master.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ services: 
      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 5m

      start_period: 2m

    deploy:

      mode: replicated

      replicas: 1

deploy/docker-compose.geoserver-slave.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ services: 
      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 5m

      start_period: 2m

    deploy:

      mode: replicated

      labels: