Commit 88465d26 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-fixLanguageDetection' into 'dev' 

Hotfix fix language detection

See merge request redmic-project/client/web!15
parents a72bbc12 05b8c692

deploy/docker-compose.dev.yml

+0 −24
Original line number Diff line number Diff line
@@ -2,27 +2,3 @@ version: '3.5' 


services:

  web:
 
    ports:

      - target: ${WEB_PORT}

        published: ${WEB_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${WEB_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/

        traefik.backend: web

        traefik.frontend.errors.5xx.status: "500-599"

        traefik.frontend.errors.5xx.backend: static-pages-static-pages-static-pages

        traefik.frontend.errors.5xx.query: '/web-5xx/'

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '2'

          memory: 128M

        reservations:

          memory: 103M

deploy/docker-compose.prod.yml

+0 −19
Original line number Diff line number Diff line
@@ -3,25 +3,6 @@ version: '3.5' 
services:

  web:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${WEB_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/

        traefik.backend: web

        traefik.frontend.errors.5xx.status: "500-599"

        traefik.frontend.errors.5xx.backend: static-pages-static-pages-static-pages

        traefik.frontend.errors.5xx.query: '/web-5xx/'

      placement:

        constraints:

          - node.role == worker
 
      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '2'

          memory: 128M

        reservations:

          memory: 103M

deploy/docker-compose.tmpl.yml

+28 −0
Original line number Diff line number Diff line
@@ -15,6 +15,34 @@ services: 
      timeout: 10s

      retries: 3

      start_period: 2m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: '${WEB_PORT}'

        traefik.docker.network: traefik-net

        traefik.default.frontend.rule: PathPrefix:/

        traefik.es.frontend.rule: HostRegexp:{subdomain:^es\\..*$$}

        traefik.es.frontend.priority: '13'

        traefik.es.frontend.redirect.regex: ^(.*):\\/\\/es\\.(.*)$$

        traefik.es.frontend.redirect.replacement: $$1://$$2

        traefik.es.frontend.redirect.permanent: true

        traefik.en.frontend.rule: HostRegexp:{subdomain:^en\\..*$$}

        traefik.en.frontend.priority: '13'

        traefik.en.frontend.headers.customRequestHeaders: content-language:en

        traefik.backend: web

        traefik.frontend.errors.5xx.status: 500-599

        traefik.frontend.errors.5xx.backend: static-pages-static-pages-static-pages

        traefik.frontend.errors.5xx.query: '/web-5xx/'

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '2'

          memory: 128M

        reservations:

          memory: 103M



networks:

  redmic-net:

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.11.1",

  "version": "0.11.2",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

yarn.lock

+596 −0

File changed.

Preview size limit exceeded, changes collapsed.