Commit 188442d3 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Configura tiempos de restart_policy

See merge request redmic-project/client/web!5
parents 4c63157e c2df36e1

.gitlab-ci.yml

+8 −3
Original line number Diff line number Diff line
@@ -43,7 +43,11 @@ prepare-unbuilt-version: 
run-unit-tests:

  stage: test-code

  image: registry.gitlab.com/redmic-project/docker/web-build:latest

  script: grunt test

  script:

    - grunt test | tee test.out

    - "coverage=$(grep '^All files.*' test.out | cut -d '|' -f 2 | tr -d ' ')"

    - 'echo "Coverage: ${coverage}%"'

    - rm test.out

  only:

    - branches

  except:
@@ -272,9 +276,10 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: redmic

    SERVICES_TO_CHECK: redmic_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

README.md

+5 −3
Original line number Diff line number Diff line 
# Web

# REDMIC web client



[![pipeline status](https://git.redmic.net/redmic-client/web/badges/dev/pipeline.svg)](https://git.redmic.net/redmic-client/web/commits/dev)

[![coverage report](https://git.redmic.net/redmic-client/web/badges/dev/coverage.svg)](https://git.redmic.net/redmic-client/web/commits/dev)

| Metrics | Master | Develop |

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

| CI status | [![pipeline status](https://gitlab.com/redmic-project/client/web/badges/master/pipeline.svg)](https://gitlab.com/redmic-project/client/web/commits/master) | [![pipeline status](https://gitlab.com/redmic-project/client/web/badges/dev/pipeline.svg)](https://gitlab.com/redmic-project/client/web/commits/dev) |

| Test coverage | [![coverage report](https://gitlab.com/redmic-project/client/web/badges/master/coverage.svg)](https://gitlab.com/redmic-project/client/web/commits/master) | [![coverage report](https://gitlab.com/redmic-project/client/web/badges/dev/coverage.svg)](https://gitlab.com/redmic-project/client/web/commits/dev) |



Cliente web de REDMIC.

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: