Commit 0cf4e41e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

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

parents c2406fe5 32453044

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ deploy-geoserver-slave-dev: 
    GEOSERVER_SUBDOMAIN: ${DEV_GEOSERVER_SUBDOMAIN}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh gis-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -144,6 +145,7 @@ deploy-geoserver-slave-supporting-branch: 
    GEOSERVER_SUBDOMAIN: ${DEV_GEOSERVER_SUBDOMAIN}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh gis-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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: 2m

      start_period: 4m



networks:

  gis-net: