Commit 7b2b5a10 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/server/api into dev

parents d29028f4 5eda09cf

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ deploy-dev: 
    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${DEV_S3_BUCKET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -144,9 +145,10 @@ deploy-dev: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}

      ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER} AWS_REGION=${AWS_REGION} S3_BUCKET="${S3_BUCKET}"

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

    url: https://${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

  only:

    - dev
@@ -172,6 +174,7 @@ deploy-supporting-branch: 
    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${DEV_S3_BUCKET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -181,9 +184,10 @@ deploy-supporting-branch: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}

      ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER} AWS_REGION=${AWS_REGION} S3_BUCKET="${S3_BUCKET}"

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

    url: https://${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

  only:

    - branches

  except:
@@ -213,6 +217,7 @@ deploy-pro: 
    ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${PRO_S3_BUCKET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -222,6 +227,7 @@ deploy-pro: 
      SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}

      ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER} AWS_REGION=${AWS_REGION} S3_BUCKET="${S3_BUCKET}"

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ version: '3.5' 


services:

  api:

    ports:

      - target: ${MICROSERVICE_PORT}

        published: ${MICROSERVICE_PORT}

        mode: host

    deploy:

      resources:

        limits:

deploy/docker-compose.tmpl.yml

+7 −9
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ services: 
      - mediastorage-private-vol:/data/MEDIA_STORAGE

      - mediastorage-public-vol:/data/PUBLIC_MEDIA_STORAGE

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/${MICROSERVICE_NAME}/actuator/health

      test: wget --spider -q http://localhost:${MICROSERVICE_PORT}/${MICROSERVICE_NAME}/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3
@@ -33,18 +33,16 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.sitemap.frontend.rule: PathPrefix:/sitemap;AddPrefix:/${MICROSERVICE_NAME}

        traefik.sitemap.backend: ${MICROSERVICE_NAME}

        traefik.microservice.frontend.rule: PathPrefix:/${MICROSERVICE_NAME}

        traefik.microservice.backend: ${MICROSERVICE_NAME}

        traefik.mediastorage.frontend.rule: PathPrefix:/${MICROSERVICE_NAME}/mediastorage/photobank/{animals|layers|species|platforms|organisations}

        traefik.sitemap.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/sitemap;AddPrefix:/${MICROSERVICE_NAME}

        traefik.microservice.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/${MICROSERVICE_NAME}

        traefik.mediastorage.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/${MICROSERVICE_NAME}/mediastorage/photobank/{animals|layers|species|platforms|organisations}

        traefik.mediastorage.frontend.redirect.regex: ^.*/${MICROSERVICE_NAME}/mediastorage/(photobank)/(animals|layers|species|platforms|organisations)/(.+\\.(?:gif|jpe?g|png))$$

        traefik.mediastorage.frontend.redirect.replacement: https://s3-${AWS_REGION}.amazonaws.com/${S3_BUCKET}/public/$$1/$$2/$$3

        traefik.grafcan.frontend.rule: PathPrefix:/grafcan

        traefik.grafcan.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/grafcan

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

        traefik.grafcan.frontend.redirect.replacement: https://visor.grafcan.es/busquedas/toponimoxml$$1

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

      restart_policy:

        delay: 1m

        window: 3m