Commit 79ffc0e4 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Corrige badges, configura tiempos de restart_policy

See merge request redmic-project/server/user!5
parents b520d877 631c1b52

README.md

+2 −2
Original line number Diff line number Diff line 
|    Metrics    |                                                                                     Master                                                                                     |                                                                                  Develop                                                                                 |

|:-------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

| CI status     | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/master/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/dev/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |

| Test coverage | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/master/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/dev/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |
 
 No newline at end of file
 
| CI status     | [![pipeline status](https://gitlab.com/redmic-project/server/user/badges/master/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![pipeline status](https://gitlab.com/redmic-project/server/user/badges/dev/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |

| Test coverage | [![coverage report](https://gitlab.com/redmic-project/server/user/badges/master/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![coverage report](https://gitlab.com/redmic-project/server/user/badges/dev/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |
 
 No newline at end of file

docker-compose.prod.yml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ services: 
          - node.role == worker

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



networks:

  traefik-net: