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

Merge branch 'dev' into 'master' 

Añade creación de red a dev

See merge request redmic-project/gis/geoserver!34
parents c750ce44 352fd3a2

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ deploy-dev: 
    GEOSERVER_ADMIN_SUBDOMAIN: ${DEV_GEOSERVER_ADMIN_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} GEOSERVER_ADMIN_SUBDOMAIN=${GEOSERVER_ADMIN_SUBDOMAIN}
@@ -94,6 +95,7 @@ deploy-supporting-branch: 
    GEOSERVER_ADMIN_SUBDOMAIN: ${DEV_GEOSERVER_ADMIN_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} GEOSERVER_ADMIN_SUBDOMAIN=${GEOSERVER_ADMIN_SUBDOMAIN}