Commit fcdd3a54 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Setea proxy para master y slave

See merge request redmic-project/gis/geoserver!25
parents 81a3f6ee 82ad90d0

docker-compose.tmpl.yml

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ROLE=master

      - JAVA_OPTS=-Xmx512m -Xss512m

      - JAVA_OPTS=-Xmx512m -Xss512m -Dhttp.proxyHost=https://${GEOSERVER_ADMIN_SUBDOMAIN}.${PUBLIC_HOSTNAME}/geoserver

      - GEOSERVER_PORT

      - GEOSERVER_USER

      - GEOSERVER_PASS
@@ -28,7 +28,7 @@ services: 
  geoserver-slave:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - JAVA_OPTS=-Xmx1g -Xss1g -DGEOSERVER_CONSOLE_DISABLED=true

      - JAVA_OPTS=-Xmx1g -Xss1g -DGEOSERVER_CONSOLE_DISABLED=true -Dhttp.proxyHost=https://${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}/geoserver

    networks:

      - gis-net

      - postgres-net