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

Merge branch 'feature-addInternalUrl' into 'dev' 

Filtra campo internalUrl

See merge request redmic-project/server/api!34
parents 28647c5b a718cd28

deploy/.env

+3 −0
Original line number Diff line number Diff line
@@ -3,3 +3,6 @@ PARENT_IMAGE_TAG=latest 


MICROSERVICE_NAME=api

MICROSERVICE_PORT=8080



TRAEFIK_ENTRYPOINT=http

TRAEFIK_SUBDOMAIN=metadata

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  api:

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  api:

deploy/docker-compose.tmpl.yml

+15 −8
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  api:
@@ -43,13 +43,20 @@ services: 
      mode: replicated

      replicas: ${REPLICAS:-1}

      labels:

        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|species|platforms|organisations}

        traefik.mediastorage.frontend.redirect.regex: ^.*/${MICROSERVICE_NAME}/mediastorage/(photobank)/(animals|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.backend: ${MICROSERVICE_NAME}

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.enable: 'true'



        traefik.http.routers.redmic-api.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.redmic-api.rule: (Host(`${PUBLIC_HOSTNAME}`) || Host(`${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)) && PathPrefix(`/${MICROSERVICE_NAME}`)



        traefik.http.services.redmic-api.loadbalancer.server.port: ${MICROSERVICE_PORT}



        traefik.http.routers.mediastorage.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.mediastorage.rule: Host(`${PUBLIC_HOSTNAME}`) && PathPrefix(`/${MICROSERVICE_NAME}/mediastorage/photobank/{type:animals|species|platforms|organisations}`)

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

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

        traefik.http.middlewares.mediastorage-redirect-regex.redirectregex.permanent: 'true'

        traefik.http.routers.mediastorage.middlewares: mediastorage-redirect-regex

        traefik.http.routers.mediastorage.service: noop@internal

      restart_policy:

        delay: ${RESTART_DELAY:-1m}

      update_config:

pom.xml

+4 −12
Original line number Diff line number Diff line
@@ -13,19 +13,18 @@ 
	<modelVersion>4.0.0</modelVersion>

	<artifactId>api</artifactId>

	<packaging>jar</packaging>

	<version>0.12.0</version>

	<version>0.12.0-feature-addInternalUrl</version>

	<name>API</name>

	<description>RESTful web services</description>



	<properties>

		<!-- REDMIC -->

		<redmic.db.version>0.8.0</redmic.db.version>

		<redmic.elasticsearch.version>0.9.0</redmic.elasticsearch.version>

		<redmic.db.version>0.8.0-feature-addInternalUrl</redmic.db.version>

		<redmic.elasticsearch.version>0.9.0-feature-addInternalUrl</redmic.elasticsearch.version>

		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>

		<redmic.utils.version>0.10.0-feature-changeJtsVersion</redmic.utils.version>

		<redmic.models.version>0.13.0</redmic.models.version>

		<redmic.models.version>0.13.0-feature-addInternalUrl</redmic.models.version>

		<redmic.mediastorage.version>0.7.0</redmic.mediastorage.version>

		<redmic.sitemapgen4j.version>0.6.0</redmic.sitemapgen4j.version>



		<redmic.test-utils.version>0.11.0</redmic.test-utils.version>
@@ -84,13 +83,6 @@ 
			<version>${redmic.mediastorage.version}</version>

		</dependency>



		<!-- Generate sitemap -->

		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>sitemapgen4j</artifactId>

			<version>${redmic.sitemapgen4j.version}</version>

		</dependency>



		<!-- SpringBoot -->



		<dependency>