Commit 6f8ff7fb authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Aumenta recursos de memoria y reduce pila a mitad

See merge request redmic-project/server/user!9
parents f3a22a3a 06d3f67b

deploy/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          memory: 512M

        reservations:

          memory: 205M
 
          memory: 410M

deploy/docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          memory: 512M

        reservations:

          memory: 205M
 
          memory: 410M

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ services: 
      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - RECAPTCHA_SECRET

      - JAVA_OPTS=-XX:MaxRAMFraction=1

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - postgres-net

      - redmic-net