Commit a4d3b944 authored Aug 22, 2018 by Ignacio

Merge branch 'dev' into 'master'

Instala fuente fonts-lyx

See merge request redmic-project/gis/geoserver!27

parents f3940745 5adc91e0

Dockerfile

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ RUN apt-get update && \
		ttf-bitstream-vera \
		ttf-sjfonts \
		tv-fonts \
		fonts-lyx \
		libtcnative-1 \
		libgdal20 \
		libgdal-java \

docker-compose.prod.yml

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ services:
		- node.role == manager
		restart_policy:
		condition: on-failure
		max_attempts: 3
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.25'
		@@ -43,7 +44,8 @@ services:
		- node.role == worker
		restart_policy:
		condition: on-failure
		max_attempts: 3
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.50'