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

Merge branch 'dev' into 'master' 

Generaliza deploy y añade redirección para master

See merge request redmic-project/gis/geoserver!44
parents 1a1b3de0 cd575344

.dockerignore

+6 −5
Original line number Diff line number Diff line 
resources/*

!resources/*.zip

!resources/*.jar

!resources/*.deb

!resources/*.tar.gz
 
 No newline at end of file
 
*

!/resources/*.zip

!/resources/*.jar

!/resources/*.deb

!/resources/*.tar.gz

!/scripts

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

+0 −24
Original line number Diff line number Diff line 
version: '3.5'



services:

  geoserver-master:

    ports:

      - target: ${GEOSERVER_PORT}

        published: 8095

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: geoserver-master

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  geoserver-vol:

    name: geoserver-vol

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

+1 −24
Original line number Diff line number Diff line 
version: '3.5'



services:

  geoserver-master:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: geoserver-master

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  geoserver-vol:

    name: "geoserver-vol"

    name: geoserver-vol

    driver: "cloudstor:aws"

    driver_opts:

      backing: shared

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

+21 −0
Original line number Diff line number Diff line
@@ -26,6 +26,27 @@ services: 
      timeout: 10s

      retries: 3

      start_period: 4m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

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

        traefik.backend: geoserver-master

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



networks:

  gis-net:

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

+1 −11
Original line number Diff line number Diff line
@@ -3,20 +3,10 @@ version: '3.5' 
services:

  geoserver-slave:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.frontend.headers.customResponseHeaders: "Access-Control-Allow-Origin: *"

        traefik.backend: geoserver-slave

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.75'

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M