This project is archived. Its data is read-only.

Commit ee393701 authored Sep 07, 2018 by Pedro Eduardo Trujillo

Merge branch 'dev' into 'master'

Permite reiniciar servicios al arrancar la máquina

See merge request redmic-project/metric/swarmprom-ci!9

parents d11c0397 b753c36c

docker-compose.dev.yml

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ services:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		@@ -46,7 +45,6 @@ services:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		@@ -141,7 +139,6 @@ services:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:

docker-compose.prod.yml

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ services:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		@@ -42,7 +41,6 @@ services:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		@@ -125,7 +123,6 @@ services:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources: