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

Merge branch 'dev' into 'master' 

Corrige prioridad, ubicación y redes de contenedor

See merge request redmic-project/gis/geoserver!14
parents 80052fbd 6cdd95b5

docker-compose.prod.yml

+4 −2
Original line number Diff line number Diff line
@@ -11,11 +11,12 @@ services: 
        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver,PathPrefix:/geoserver/web,PathPrefix:/geoserver/rest"

        traefik.frontend.priority: "1"

        traefik.frontend.priority: "100"

        traefik.backend: geoserver-master

      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 1

      restart_policy:

        condition: on-failure

        max_attempts: 3
@@ -30,11 +31,12 @@ services: 
        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/{((?!web).*)};PathPrefix:/geoserver/{((?!rest).*)}"

        traefik.frontend.priority: "1"

        traefik.frontend.priority: "100"

        traefik.backend: geoserver-slave

      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid != 1

      restart_policy:

        condition: on-failure

        max_attempts: 3

docker-compose.tmpl.yml

+0 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ services: 
      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - gis-net

      - postgres-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck:
@@ -37,5 +36,3 @@ services: 
networks:

  gis-net:

    external: true
 
  postgres-net:

    external: true
 
 No newline at end of file