Commit 8bcce3e7 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-fixDeployAndTagBugs' into 'master' 

Hotfix fix deploy and tag bugs

See merge request redmic-project/client/web!16
parents 2b67b536 8a106531

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ docker-tag-already-built-image: 
    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ services: 
        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.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

package.json

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

  "name": "REDMIC",

  "version": "0.11.2",

  "version": "0.11.3",

  "author": "Observatorio Ambiental Granadilla",

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

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