Commit bb84261a authored by Noel Alonso's avatar Noel Alonso
Browse files

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

parents f2c44a52 b3015f93

.gitlab-ci.yml

+9 −3
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ deploy-dev: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${DEV_S3_BUCKET}

  services:

    - docker:dind

  script:
@@ -140,7 +142,7 @@ deploy-dev: 
      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      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}

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

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -166,6 +168,8 @@ deploy-supporting-branch: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${DEV_S3_BUCKET}

  services:

    - docker:dind

  script:
@@ -174,7 +178,7 @@ deploy-supporting-branch: 
      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      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}

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

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -204,6 +208,8 @@ deploy-pro: 
    AWS_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${PRO_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}

    AWS_REGION: ${AWS_REGION}

    S3_BUCKET: ${PRO_S3_BUCKET}

  services:

    - docker:dind

  script:
@@ -212,7 +218,7 @@ deploy-pro: 
      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}

      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}

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

  environment:

    name: pro

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

deploy/docker-compose.dev.yml

+9 −3
Original line number Diff line number Diff line
@@ -10,10 +10,16 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

        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.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.redirect.regex: ^.*/grafcan(.*)$$

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

      restart_policy:

        delay: 1m

        window: 3m

deploy/docker-compose.prod.yml

+9 −3
Original line number Diff line number Diff line
@@ -6,10 +6,16 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

        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.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.redirect.regex: ^.*/grafcan(.*)$$

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

      placement:

        constraints:

          - node.role == worker

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ services: 
      - AWS_ACCESS_KEY

      - AWS_SECRET_KEY

      - ELASTIC_XPACKSECURITYUSER

      - JAVA_OPTS=-XX:MaxRAMFraction=1

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - elastic-net

      - postgres-net