Commit 677521b5 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Añade MaxRAMFraction=1 a JAVA_OPTS

See merge request redmic-project/gis/geoserver!31
parents 7bb84d53 dc485f1e

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
     -XX:+HeapDumpOnOutOfMemoryError \

     -XX:MaxNewSize=256m \

     -XX:NewSize=256m \

     -XX:MaxMetaspaceSize=128m \

     -XX:SurvivorRatio=12 \

     -XX:MaxTenuringThreshold=0 \

     -XX:+UseConcMarkSweepGC \
@@ -25,6 +26,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
     -XX:PerfDataSamplingInterval=500 \

     -XX:+UnlockExperimentalVMOptions \

     -XX:+UseCGroupMemoryLimitForHeap \

     -XX:MaxRAMFraction=1 \

     -Djava.awt.headless=true \

     -Dorg.geotools.referencing.forceXY=true \

     -Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni" \

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ services: 
  geoserver-slave:

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

    environment:

      - JAVA_OPTS=-Xmx2g -Xss2g -DGEOSERVER_CONSOLE_DISABLED=true -DPROXY_BASE_URL=https://${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}/geoserver

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

    networks:

      - gis-net

      - postgres-net