Commit 02c334b4 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Corrige paso de variables desde el CI

See merge request redmic-project/gis/geoserver!55
parents 40ff62a2 5b1a8c2a

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ variables: 
  script:

    - >

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

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

      GEOSERVER_PASS=${GEOSERVER_PASS}

      GEOSERVER_ADMIN_SUBDOMAIN=${GEOSERVER_ADMIN_SUBDOMAIN} GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} GEOSERVER_PASS=${GEOSERVER_PASS}

  environment:

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

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

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ services: 
      - SLAVE_MANAGEMENT_TIMEOUT

      - ROLE=master

      - SWARM_MODE=true

      - JAVA_OPTS=-DPROXY_BASE_URL=https://${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}/geoserver

      - JAVA_OPTS=-DPROXY_BASE_URL=https://${GEOSERVER_ADMIN_SUBDOMAIN}.${PUBLIC_HOSTNAME}/geoserver

    networks:

      - gis-net

      - postgres-net
@@ -30,8 +30,8 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.admin.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver'

        traefik.root.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};Path:/;AddPrefix:/geoserver'

        traefik.admin.frontend.rule: 'Host:${GEOSERVER_ADMIN_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver'

        traefik.root.frontend.rule: 'Host:${GEOSERVER_ADMIN_SUBDOMAIN}.${PUBLIC_HOSTNAME};Path:/;AddPrefix:/geoserver'

        traefik.backend: geoserver-master

        traefik.port: '${GEOSERVER_PORT}'

      placement: